Changeset 82e4f398 in ffmpeg

Timestamp:
May 1, 2014, 1:56:38 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
97edb195
Parents:
154d80ea (diff), a1aa37dd (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/01/14 13:02:44)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/01/14 13:56:38)
Message:

Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'

Conflicts:

libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74

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

(No files)

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