Changeset 9a573096 in ffmpeg

Timestamp:
Nov 24, 2014, 1:07:35 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1d242f98
Parents:
7a19a8fb (diff), fe42f94c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Michael Niedermayer <michaelni@gmx.at> (11/24/14 13:07:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/24/14 13:07:35)
Message:

Merge commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9'

Merged-by: Michael Niedermayer <michaelni@gmx.at>

(No files)

Note: See TracChangeset for help on using the changeset viewer.