Changeset 5dd97d58 in ffmpeg

Timestamp:
Mar 14, 2014, 12:25:57 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0f958568
Parents:
27cab16c (diff), db3f61a0 (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> (03/14/14 00:25:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/14/14 00:25:57)
Message:

Merge commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b'

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

(No files)

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