Changeset 517ec808 in ffmpeg

Timestamp:
Dec 4, 2013, 7:50:23 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8dd4f5ec
Parents:
a6af5da7 (diff), 5ec4673 (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> (12/04/13 19:50:11)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/04/13 19:50:23)
Message:

Merge commit '5ec467328122b80fac94c2d5e3e7540d50381868'

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

(No files)

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