Changeset acda7c8e in ffmpeg

Timestamp:
Dec 14, 2013, 10:13:55 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7431923d
Parents:
2cfccd80 (diff), 70a7b24d (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/14/13 10:13:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/14/13 10:13:55)
Message:

Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

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

(No files)

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