Changeset 328a5b93 in ffmpeg

Timestamp:
Sep 27, 2013, 9:45:37 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
72eddc10
Parents:
47c5c942 (diff), 06ebc0bf (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> (09/27/13 09:45:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/27/13 09:45:37)
Message:

Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'

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

(No files)

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