Changeset 1e678007 in ffmpeg

Timestamp:
Oct 4, 2013, 9:28:21 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
90e1fc8b
Parents:
8378aae7 (diff), 80fefbed (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/04/13 09:28:15)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/04/13 09:28:21)
Message:

Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08'

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

(No files)

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