Changeset 0c06ca7a in ffmpeg

Timestamp:
May 3, 2014, 9:21:26 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
03963063
Parents:
3ea5beab (diff), a90d92ce (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/03/14 21:21:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/03/14 21:21:26)
Message:

Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

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

(No files)

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