diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 15:02:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 15:56:38 +0200 |
| commit | 82e4f39883932c1b1e5c7792a1be12dec6ab603d (patch) | |
| tree | 92de9b08e68730d7a31802e99548f48bac1aed1a /libavformat/mpeg.c | |
| parent | 154d80eae70b73c683e70a157e73173aabb26a58 (diff) | |
| parent | a1aa37dd0b96710d4a17718198a3f56aea2040c1 (diff) | |
| download | ffmpeg-streaming-82e4f39883932c1b1e5c7792a1be12dec6ab603d.zip ffmpeg-streaming-82e4f39883932c1b1e5c7792a1be12dec6ab603d.tar.gz | |
Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'
* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1':
matroskaenc: write CodecDelay
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>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions
