Changeset b5657516 in ffmpeg

Timestamp:
May 27, 2014, 11:00:10 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
919c320f
Parents:
5313d60 (diff), 9767d7c0 (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/27/14 22:57:49)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/27/14 23:00:10)
Message:

Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'

Conflicts:

tests/ref/lavf/ogg

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

(No files)

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