Changeset 4d943cec in ffmpeg

Timestamp:
Feb 20, 2014, 10:02:38 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1bef9c5e
Parents:
0c803eba (diff), 982b596 (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> (02/20/14 21:48:00)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/20/14 22:02:38)
Message:

Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'

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

(No files)

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