ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Wed Mar 1 23:40:35 2017 +0100| [9ae762da7e256aa4d3b645c614fcd1959e1cbb8d] | committer: Carl Eugen Hoyos
lavf/matroska: Support codec ID V_FFV1 for demuxing. Fixes ticket #6206. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ae762da7e256aa4d3b645c614fcd1959e1cbb8d --- libavformat/matroska.c | 1 + libavformat/matroskaenc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index fda96fb..7905fd1 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, + {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO}, {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7cb8893..1622b44 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1138,7 +1138,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, // if none are found, use AVI codes if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { - if (ff_mkv_codec_tags[j].id == par->codec_id) { + if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); native_id = 1; break; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
