Changeset be879af in ffmpeg

Timestamp:
Mar 13, 2014, 10:41:40 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1c788eac
Parents:
d61e1156 (diff), d1184b81 (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> (03/13/14 22:41:36)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/13/14 22:41:40)
Message:

Merge commit 'd1184b8110b4847013bf25222e6809eb3462913c'

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

(No files)

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