Changeset d35efda2 in ffmpeg

Timestamp:
Apr 17, 2014, 7:45:58 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
39edcadc
Parents:
11d187b3 (diff), ae43c10e (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> (04/17/14 19:45:39)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/17/14 19:45:58)
Message:

Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'

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

(No files)

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