Changeset 76581ab8 in ffmpeg

Timestamp:
May 13, 2014, 6:34:32 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d90ba41
Parents:
cef99e12 (diff), 9aa45920 (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/13/14 18:34:22)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/13/14 18:34:32)
Message:

Merge commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5'

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

(No files)

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