Changeset 7fb12342 in ffmpeg

Timestamp:
Oct 6, 2013, 9:31:01 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5710f55e
Parents:
d0b27036 (diff), 258414d0 (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> (10/06/13 09:30:54)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/06/13 09:31:01)
Message:

Merge commit '258414d0771845d20f646ffe4d4e60f22fba217c'

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

(No files)

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