6 files changed, 9 insertions, 8 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.c b/demux/demux.c
index 4fb121e29e..ba632218ec 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -116,12 +116,11 @@ static void ds_free_packs(struct demux_stream *ds)
     ds->eof = 0;
 }
 
-static int packet_destroy(void *ptr)
+static void packet_destroy(void *ptr)
 {
     struct demux_packet *dp = ptr;
     talloc_free(dp->avpacket);
     free(dp->allocation);
-    return 0;
 }
 
 static struct demux_packet *create_packet(size_t len)
@@ -193,10 +192,9 @@ void free_demux_packet(struct demux_packet *dp)
     talloc_free(dp);
 }
 
-static int destroy_avpacket(void *pkt)
+static void destroy_avpacket(void *pkt)
 {
     av_free_packet(pkt);
-    return 0;
 }
 
 struct demux_packet *demux_copy_packet(struct demux_packet *dp)
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 1e071f20e2..9b8881fc8a 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -717,10 +717,9 @@ static void seek_reset(demuxer_t *demux)
     priv->num_packets = 0;
 }
 
-static int destroy_avpacket(void *pkt)
+static void destroy_avpacket(void *pkt)
 {
     av_free_packet(pkt);
-    return 0;
 }
 
 static int read_more_av_packets(demuxer_t *demux)
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 88e91a3717..ea5a22f6ee 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1190,6 +1190,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/demux_raw.c b/demux/demux_raw.c
index 9e4822ae79..637253c8e1 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -53,8 +53,8 @@ const m_option_t demux_rawaudio_opts[] = {
 static int vformat = MP_FOURCC_I420;
 static int mp_format;
 static char *codec;
-static int width = 0;
-static int height = 0;
+static int width = 1280;
+static int height = 720;
 static float fps = 25;
 static int imgsize = 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"