aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorYusuke Nakamura <muken.the.vfrmaniac@gmail.com>2013-10-03 14:34:53 +0900
committerAnton Khirnov <anton@khirnov.net>2013-10-31 20:20:49 +0100
commit959bea13ce3498a5bddf8a415a061a7bb5a8b075 (patch)
tree9b6b109b9dda6fb9766c980f75ece3e95f11763b /libavformat/matroska.c
parentea29f965dc71182f77b8efe819630f55e48b0ab7 (diff)
downloadffmpeg-959bea13ce3498a5bddf8a415a061a7bb5a8b075.tar.gz
matroskadec: Support HEVC demuxing
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 7976be04a3..410e2f40c3 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -70,6 +70,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},
+ {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},
{"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
{"V_PRORES" , AV_CODEC_ID_PRORES},
{"V_REAL/RV10" , AV_CODEC_ID_RV10},