Changeset 97c285e6 in ffmpeg

Timestamp:
Jun 13, 2014, 5:51:35 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1df441ea
Parents:
684a9152 (diff), 27631796 (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/13/14 17:10:19)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/13/14 17:51:35)
Message:

Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'

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

(No files)

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