Changeset 77eff7a5 in ffmpeg

Timestamp:
Oct 31, 2014, 1:37:49 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
dd2f868
Parents:
61f1c96e (diff), c55d1d3 (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/31/14 01:31:59)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/31/14 01:37:49)
Message:

Merge commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a'

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

(No files)

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