Changeset 8159fe2 in ffmpeg

Timestamp:
Jun 11, 2014, 11:19:57 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3a1c8951
Parents:
508e7a5c (diff), 2f417031 (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/11/14 22:55:48)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/11/14 23:19:57)
Message:

Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'

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

(No files)

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