summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-03 16:12:40 +0200
committerwm4 <wm4@nowhere>2013-12-01 19:18:50 +0100
commit8fe6f2542a18ac4f1581240cbc6df563cbfc824f (patch)
treeb9617b9a4654f3831753e0af787070bcad673665
parentb553a43667abe6af7c4d5db7a003efd70f0c8d1a (diff)
downloadmpv-8fe6f2542a18ac4f1581240cbc6df563cbfc824f.tar.bz2
mpv-8fe6f2542a18ac4f1581240cbc6df563cbfc824f.tar.xz
demux_mkv: add support for HEVC
Note that you still need --vd-lavc-o='strict=-2' to enable the decoder. Also, there's no guarantee that all required features for HEVC demuxing are actually implemented, nor that the current muxing schema is the final one.
-rw-r--r--demux/codec_tags.c1
-rw-r--r--demux/demux_mkv.c1
-rw-r--r--demux/matroska.h2
3 files changed, 4 insertions, 0 deletions
diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index ba3472dda3..66489aae03 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -313,6 +313,7 @@ static const struct mp_codec_tag mp_video_codec_tags[] = {
{MKTAG('C', '9', '3', 'V'), "c93"},
{MKTAG('V', 'P', '9', '0'), "vp9"},
{MKTAG('p', 'r', '0', '0'), "prores"},
+ {MKTAG('H', 'E', 'V', 'C'), "hevc"},
{0},
};
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index bbbe88d903..438697abed 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1169,6 +1169,7 @@ static const videocodec_info_t vinfo[] = {
{MKV_V_VP9, mmioFOURCC('V', 'P', '9', '0'), 0},
{MKV_V_DIRAC, mmioFOURCC('d', 'r', 'a', 'c'), 0},
{MKV_V_PRORES, mmioFOURCC('p', 'r', '0', '0'), 0},
+ {MKV_V_HEVC, mmioFOURCC('H', 'E', 'V', 'C'), 1},
{NULL, 0, 0}
};
diff --git a/demux/matroska.h b/demux/matroska.h
index 262686dcd5..796f6c24d3 100644
--- a/demux/matroska.h
+++ b/demux/matroska.h
@@ -80,6 +80,8 @@
#define MKV_V_UNCOMPRESSED "V_UNCOMPRESSED"
#define MKV_V_DIRAC "V_DIRAC"
#define MKV_V_PRORES "V_PRORES"
+#define MKV_V_PRORES "V_PRORES"
+#define MKV_V_HEVC "V_MPEGH/ISO/HEVC"
#define MKV_S_TEXTASCII "S_TEXT/ASCII"
#define MKV_S_TEXTUTF8 "S_TEXT/UTF8"