Changeset fd116b8d in ffmpeg

Timestamp:
May 31, 2015, 11:26:36 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0aba7192
Parents:
eb5a308d (diff), 378a0008 (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/31/15 23:17:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/31/15 23:26:36)
Message:

Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'

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

(No files)

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