Changeset 1724123 in ffmpeg

Timestamp:
May 23, 2013, 8:25:25 AM (12 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1fded9b6
Parents:
c54a1565 (diff), 3eae9b03 (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> (05/23/13 08:24:15)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/23/13 08:25:25)
Message:

Merge commit '3eae9b030cbbdc263f69834b791624613032d548'

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

(No files)

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