Changeset 9da88d5 in ffmpeg

Timestamp:
Mar 19, 2014, 8:14:32 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f502234f
Parents:
2ef6c0fd (diff), 606cc8af (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/19/14 20:14:27)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/19/14 20:14:32)
Message:

Merge commit '606cc8afa1cb782311f68560c8f9bad978cdcc32'

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

(No files)

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