Changeset fadec4f6 in ffmpeg

Timestamp:
Jan 4, 2014, 1:11:33 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4b8bc6d2
Parents:
8e6af036 (diff), 3d95d273 (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> (01/04/14 01:11:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/04/14 01:11:33)
Message:

Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

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

(No files)

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