Changeset 8a216138 in ffmpeg

Timestamp:
May 9, 2014, 2:44:25 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3554c2fa
Parents:
a7b554f8 (diff), 9880a0d4 (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/09/14 14:43:10)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/09/14 14:44:25)
Message:

Merge commit '9880a0d4b131ef36694d62f78060350a81f08b80'

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

(No files)

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