Author: reimar Date: Mon Feb 2 23:50:30 2015 New Revision: 37366 Log: demux_mkv: Add HEVC and VP9 support, the latter untested. Note that lavf is preferred and I only did this because it was trivial. Fixes trac issue #2221. Modified: trunk/libmpdemux/demux_mkv.c trunk/libmpdemux/matroska.h Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c Mon Feb 2 22:41:46 2015 (r37365) +++ trunk/libmpdemux/demux_mkv.c Mon Feb 2 23:50:30 2015 (r37366) @@ -1493,6 +1493,7 @@ typedef struct { } videocodec_info_t; static const videocodec_info_t vinfo[] = { + {MKV_V_HEVC, mmioFOURCC('h', 'e', 'v', '1'), 1}, {MKV_V_MPEG1, mmioFOURCC('m', 'p', 'g', '1'), 0}, {MKV_V_MPEG2, mmioFOURCC('m', 'p', 'g', '2'), 0}, {MKV_V_MPEG4_SP, mmioFOURCC('m', 'p', '4', 'v'), 1}, @@ -1501,6 +1502,7 @@ static const videocodec_info_t vinfo[] = {MKV_V_MPEG4_AVC, mmioFOURCC('a', 'v', 'c', '1'), 1}, {MKV_V_THEORA, mmioFOURCC('t', 'h', 'e', 'o'), 1}, {MKV_V_VP8, mmioFOURCC('V', 'P', '8', '0'), 0}, + {MKV_V_VP9, mmioFOURCC('V', 'P', '9', '0'), 0}, {NULL, 0, 0} }; Modified: trunk/libmpdemux/matroska.h ============================================================================== --- trunk/libmpdemux/matroska.h Mon Feb 2 22:41:46 2015 (r37365) +++ trunk/libmpdemux/matroska.h Mon Feb 2 23:50:30 2015 (r37366) @@ -62,6 +62,7 @@ #define MKV_V_SORENSONV2 "V_SORENSON/V2" #define MKV_V_SORENSONV3 "V_SORENSON/V3" #define MKV_V_CINEPAK "V_CINEPAK" +#define MKV_V_HEVC "V_MPEGH/ISO/HEVC" #define MKV_V_QUICKTIME "V_QUICKTIME" #define MKV_V_MPEG1 "V_MPEG1" #define MKV_V_MPEG2 "V_MPEG2" @@ -71,6 +72,7 @@ #define MKV_V_MPEG4_AVC "V_MPEG4/ISO/AVC" #define MKV_V_THEORA "V_THEORA" #define MKV_V_VP8 "V_VP8" +#define MKV_V_VP9 "V_VP9" #define MKV_S_TEXTASCII "S_TEXT/ASCII" #define MKV_S_TEXTUTF8 "S_TEXT/UTF8"
participants (1)
-
reimar