Changeset 87d38ad8 in ffmpeg

Timestamp:
Aug 28, 2013, 9:33:59 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a13af77f
Parents:
70106e73 (diff), f812eeda (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> (08/28/13 09:32:02)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/28/13 09:33:59)
Message:

Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'

Conflicts:

libavformat/matroskaenc.c
tests/fate/wavpack.mak
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

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

(No files)

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