Changeset e9cb43c6 in ffmpeg

Timestamp:
Aug 21, 2013, 10:12:10 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
16466d92
Parents:
614cf1a (diff), f34de148 (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/21/13 10:12:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/21/13 10:12:10)
Message:

Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'

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

(No files)

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