Changeset 2e0ac145 in ffmpeg

Timestamp:
Oct 20, 2014, 8:02:45 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
20d3348e
Parents:
e493814d (diff), d1afd3e1 (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> (10/20/14 19:59:24)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/20/14 20:02:45)
Message:

Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

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

(No files)

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