Changeset cbe92a93 in ffmpeg

Timestamp:
Mar 10, 2014, 10:55:41 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4da8dc64
Parents:
7f900554 (diff), 77e9123f (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/10/14 22:54:55)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/10/14 22:55:41)
Message:

Merge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'

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

(No files)

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