Changeset 2c4d5d34 in ffmpeg

Timestamp:
Nov 13, 2014, 1:01:41 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
785f71fc
Parents:
9b424acc (diff), 1a9c1333 (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> (11/13/14 13:00:55)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/13/14 13:01:41)
Message:

Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'

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

(No files)

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