Changeset 8102cdfc in ffmpeg

Timestamp:
Dec 27, 2013, 11:59:35 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7ad6515f
Parents:
8ea15018 (diff), 9ace13db (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> (12/27/13 11:25:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/27/13 11:59:35)
Message:

Merge commit '9ace13db77a22fd59c217175596a95775c5d25aa'

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

(No files)

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