Changeset f357ef2e in ffmpeg

Timestamp:
Dec 14, 2013, 9:14:01 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6659364d
Parents:
892562e9 (diff), 5db4e88e (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/14/13 21:07:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/14/13 21:14:01)
Message:

Merge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'

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

(No files)

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