Changeset e3a296df in ffmpeg

Timestamp:
Aug 10, 2013, 8:29:44 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ef13a005
Parents:
09f1afc7 (diff), cb0244da (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/10/13 08:29:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/10/13 08:29:44)
Message:

Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

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

(No files)

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