Changeset 2ee58af5 in ffmpeg

Timestamp:
Aug 1, 2013, 11:24:57 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0f5a40c2
Parents:
4f07fcd3 (diff), 1851e1d0 (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/01/13 11:24:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:24:57)
Message:

Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'

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

(No files)

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