Changeset 0842df26 in ffmpeg

Timestamp:
Apr 15, 2015, 9:57:38 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a742a053
Parents:
0fbe18b6 (diff), ec89f35e (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/15/15 09:57:00)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/15/15 09:57:38)
Message:

Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'

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

(No files)

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