Changeset e6f69b3 in ffmpeg

Timestamp:
Apr 5, 2014, 5:36:21 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
47fc82b
Parents:
e3c3f27 (diff), 57b5b84e (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> (04/05/14 17:36:07)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/05/14 17:36:21)
Message:

Merge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'

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

(No files)

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