Changeset d5560f1f in ffmpeg

Timestamp:
Jan 15, 2014, 1:42:49 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6f001d8
Parents:
d01f8790 (diff), b7b17ed6 (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> (01/15/14 13:41:41)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/15/14 13:42:49)
Message:

Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217'

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

(No files)

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