summaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorYusuke Nakamura <muken.the.vfrmaniac@gmail.com>2013-10-12 11:55:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-16 00:17:28 +0200
commit16b6839de6767924c4640d6e9204b6eeb5c53910 (patch)
tree93a733b57fa01276460f036e3e3f7fe750472837 /libavformat/matroska.c
parent53f903b7c5427cb18659f7775714e860c1c5fc39 (diff)
lavf/matroskadec: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 10d11a3cfb..77a88a8756 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -88,6 +88,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},