Changeset 57b8ce4 in ffmpeg

Timestamp:
Aug 1, 2013, 9:42:30 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d2c613dd
Parents:
0c8efe48 (diff), 2e814d03 (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> (08/01/13 09:42:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/01/13 09:42:30)
Message:

Merge commit '2e814d0329aded98c811d0502839618f08642685'

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

(No files)

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