Changeset 2cbadf51 in ffmpeg

Timestamp:
Jun 12, 2015, 9:12:06 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ea37df2d
Parents:
fd04082a (diff), 3b73d5c (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> (06/12/15 21:11:15)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/15 21:12:06)
Message:

Merge commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d'

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

(No files)

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