Changeset 55f53f6 in ffmpeg

Timestamp:
Mar 13, 2014, 11:57:25 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d926c4b2
Parents:
fdf4eb79 (diff), 6a8b35dc (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/13/14 23:57:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/13/14 23:57:25)
Message:

Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'

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

(No files)

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