Changeset f5013913 in ffmpeg

Timestamp:
Dec 14, 2013, 11:37:40 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
688c3d94
Parents:
7431923d (diff), a5a3b398 (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/14/13 10:56:22)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/14/13 11:37:40)
Message:

Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'

Conflicts:

configure

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

(No files)

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