mirror of https://git.ffmpeg.org/ffmpeg.git
lavf/matroskaenc: Always write V_QUICKTIME extradata.
Fixes ticket #5872.
This commit is contained in:
parent
34aa145468
commit
5781256c01
|
@ -752,9 +752,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
|
||||||
if (!par->codec_tag)
|
if (!par->codec_tag)
|
||||||
par->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags,
|
par->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags,
|
||||||
par->codec_id);
|
par->codec_id);
|
||||||
if (par->extradata_size) {
|
|
||||||
if ( ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == par->codec_id
|
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;
|
int i;
|
||||||
avio_wb32(dyn_cp, 0x5a + par->extradata_size);
|
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_w8(dyn_cp, 0);
|
||||||
}
|
}
|
||||||
avio_write(dyn_cp, par->extradata, par->extradata_size);
|
avio_write(dyn_cp, par->extradata, par->extradata_size);
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (!ff_codec_get_tag(ff_codec_bmp_tags, par->codec_id))
|
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",
|
av_log(s, AV_LOG_WARNING, "codec %s is not supported by this format\n",
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
// Also please add any ticket numbers that you believe might be affected here
|
// Also please add any ticket numbers that you believe might be affected here
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 57
|
#define LIBAVFORMAT_VERSION_MAJOR 57
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 51
|
#define LIBAVFORMAT_VERSION_MINOR 51
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 105
|
#define LIBAVFORMAT_VERSION_MICRO 106
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
LIBAVFORMAT_VERSION_MINOR, \
|
LIBAVFORMAT_VERSION_MINOR, \
|
||||||
|
|
Loading…
Reference in New Issue