Changeset c07b7e48 in ffmpeg

Timestamp:
Mar 21, 2015, 12:35:05 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a2740a06
Parents:
acd6b40 (diff), 5355ed6b (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/21/15 12:35:02)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/21/15 12:35:05)
Message:

Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'

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

(No files)

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