ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Tue Oct 11 10:07:18 2016 +0200| [5781256c013ee5be914105bef9fabd90ab7d7e3f] | committer: Carl Eugen Hoyos
lavf/matroskaenc: Always write V_QUICKTIME extradata. Fixes ticket #5872. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5781256c013ee5be914105bef9fabd90ab7d7e3f --- libavformat/matroskaenc.c | 4 +--- libavformat/version.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e330a12..5293a9b 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", diff --git a/libavformat/version.h b/libavformat/version.h index 1ac7392..b70e9c3 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 #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, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
