Changeset 36f94969 in ffmpeg

Timestamp:
May 16, 2014, 7:22:25 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
eb580d25
Parents:
ef7c4cd0 (diff), 4735784 (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/16/14 19:22:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/16/14 19:22:25)
Message:

Merge commit '4735784f1ced27026fbeada5fd31505132e565e9'

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

(No files)

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