From 80d0ab1058e283f81100919f06345bf4a4deae19 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 14 Apr 2013 04:36:58 +0200 Subject: demux_mkv: support vp9 Note that ffmpeg doesn't provide a decoder by default yet. --- demux/codec_tags.c | 1 + demux/demux_mkv.c | 1 + demux/matroska.h | 1 + 3 files changed, 3 insertions(+) diff --git a/demux/codec_tags.c b/demux/codec_tags.c index 70b7a9a26e..2af450ad07 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -310,6 +310,7 @@ static const struct mp_codec_tag mp_video_codec_tags[] = { {MKTAG('I', 'N', 'P', 'V'), "interplayvideo"}, {MKTAG('V', 'Q', 'A', 'V'), "ws_vqa"}, {MKTAG('C', '9', '3', 'V'), "c93"}, + {MKTAG('V', 'P', '9', '0'), "vp9"}, {0}, }; diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index bd6e725251..3531689a34 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1177,6 +1177,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} }; diff --git a/demux/matroska.h b/demux/matroska.h index be28f34282..a1bcb7b9ed 100644 --- a/demux/matroska.h +++ b/demux/matroska.h @@ -75,6 +75,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_V_MJPEG "V_MJPEG" #define MKV_V_UNCOMPRESSED "V_UNCOMPRESSED" -- cgit v1.2.3