Changeset 31876ea6 in ffmpeg

Timestamp:
Apr 13, 2014, 12:06:47 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
94cf83ff
Parents:
d06a7530 (diff), 5748faf2 (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/13/14 00:05:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/13/14 00:06:47)
Message:

Merge commit '5748faf291fec297ef25d81962b52b3438f54278'

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

(No files)

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