Changeset cec4e1c7 in ffmpeg

Timestamp:
Oct 20, 2014, 9:05:06 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
832b4c0a
Parents:
5753d967 (diff), d2771a1d (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 21:03:36)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/20/14 21:05:06)
Message:

Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'

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

(No files)

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