Changeset 09c94b57 in ffmpeg

Timestamp:
Aug 30, 2013, 9:48:54 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
01a82f1d
Parents:
e45e72f5 (diff), a6b65011 (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> (08/30/13 09:48:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/30/13 09:48:54)
Message:

Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

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

(No files)

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