Changeset 3b2b0739 in ffmpeg

Timestamp:
Dec 11, 2013, 11:08:08 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0506cc2c
Parents:
efb5ebe8 (diff), 2d1f428 (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> (12/11/13 23:07:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/11/13 23:08:08)
Message:

Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'

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

(No files)

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