Add VP9 support in mkv

Close #9341

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index a3f53775b41b281cc1ace5e81af2bdd58bd395fa..892dc2fca5c214870dba40d2bf14ad42ff9c3895 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -184,6 +184,7 @@ static const struct
     { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
 
     { VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
+    { VLC_CODEC_VP9, AV_CODEC_ID_VP9, VIDEO_ES },
 
     { VLC_CODEC_LAGARITH, AV_CODEC_ID_LAGARITH, VIDEO_ES },
 

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 2988f71a6c441fa6e1b60f439a8a12994462a4fd..c9d2c9d3ef5304c2b64b04ddf2e83f34a12b0f66 100644 (file)
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1349,6 +1349,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
         p_tk->fmt.i_codec = VLC_CODEC_VP8;
         p_tk->b_pts_only = true;
     }
+    else if( !strncmp( p_tk->psz_codec, "V_VP9", 5 ) )
+    {
+        p_tk->fmt.i_codec = VLC_CODEC_VP9;
+        fill_extra_data( p_tk, 0 );
+    }
     else if( !strncmp( p_tk->psz_codec, "V_MPEG4", 7 ) )
     {
         if( !strcmp( p_tk->psz_codec, "V_MPEG4/MS/V3" ) )