aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2017-03-01 23:40:35 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2017-03-03 02:04:34 +0100
commit9ae762da7e256aa4d3b645c614fcd1959e1cbb8d (patch)
treee86d3b35031bfa85df3c2f9825157d1b48cd274f /libavformat/matroska.c
parent55196e5d10af7c295352bb9a2d7565efe07ce46b (diff)
downloadffmpeg-9ae762da7e256aa4d3b645c614fcd1959e1cbb8d.tar.gz
lavf/matroska: Support codec ID V_FFV1 for demuxing.
Fixes ticket #6206.
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c1
1 files changed, 1 insertions, 0 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},