diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-10-11 10:07:18 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-10-11 10:07:18 +0200 |
| commit | 5781256c013ee5be914105bef9fabd90ab7d7e3f (patch) | |
| tree | e1cd09dc9871ea44a7e081b1a599f95971f282d5 /libavformat/matroskaenc.c | |
| parent | 34aa14546853c4f56c1cf0195707028d5f59a2f5 (diff) | |
| download | ffmpeg-5781256c013ee5be914105bef9fabd90ab7d7e3f.tar.gz | |
lavf/matroskaenc: Always write V_QUICKTIME extradata.
Fixes ticket #5872.
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e330a12b38..5293a9b5e3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -752,9 +752,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, if (!par->codec_tag) par->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id); - if (par->extradata_size) { if ( ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == par->codec_id - && ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(par->extradata + 4)) != par->codec_id + && (!par->extradata_size || ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(par->extradata + 4)) != par->codec_id) ) { int i; avio_wb32(dyn_cp, 0x5a + par->extradata_size); @@ -763,7 +762,6 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, avio_w8(dyn_cp, 0); } avio_write(dyn_cp, par->extradata, par->extradata_size); - } } else { if (!ff_codec_get_tag(ff_codec_bmp_tags, par->codec_id)) av_log(s, AV_LOG_WARNING, "codec %s is not supported by this format\n", |