Changeset 9b736f74 in ffmpeg

Timestamp:
May 28, 2015, 7:28:09 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
68cce010
Parents:
f0b99112 (diff), 419e3404 (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> (05/28/15 19:28:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/28/15 19:28:09)
Message:

Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622'

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

(No files)

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