Changeset 01a6ae13 in ffmpeg

Timestamp:
Jun 8, 2015, 8:35:53 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d1f7b313
Parents:
402b18af (diff), 8ef98855 (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/08/15 20:35:49)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/08/15 20:35:53)
Message:

Merge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2'

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

(No files)

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