diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-01 23:40:35 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-03 02:04:34 +0100 |
| commit | 9ae762da7e256aa4d3b645c614fcd1959e1cbb8d (patch) | |
| tree | e86d3b35031bfa85df3c2f9825157d1b48cd274f | |
| parent | 55196e5d10af7c295352bb9a2d7565efe07ce46b (diff) | |
| download | ffmpeg-9ae762da7e256aa4d3b645c614fcd1959e1cbb8d.tar.gz | |
lavf/matroska: Support codec ID V_FFV1 for demuxing.
Fixes ticket #6206.
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index fda96fb014..7905fd1ff7 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 7cb88935fb..1622b44e5e 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; |