Changeset 855e3b57 in ffmpeg

Timestamp:
Jun 1, 2014, 12:12:04 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
955b31a7
Parents:
05c5dd40 (diff), 0097cbea (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> (06/01/14 12:02:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/01/14 12:12:04)
Message:

Merge commit '0097cbea695e534fce39958ccd103af2fbf65831'

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

(No files)

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