Changeset 7a69ffaf in ffmpeg

Timestamp:
Mar 9, 2014, 9:30:58 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ce1ad8d7
Parents:
4aa48e46 (diff), 3e0175d8 (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> (03/09/14 21:30:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/09/14 21:30:58)
Message:

Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'

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

(No files)

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