Changeset 12e4493f in ffmpeg

Timestamp:
Oct 14, 2013, 1:48:34 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9ac124c8
Parents:
12ca544a (diff), c108ba01 (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> (10/14/13 13:48:30)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/14/13 13:48:34)
Message:

Merge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'

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

(No files)

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