vlc/vlc-2.1 | branch: master | Denis Charmet <[email protected]> | Sun Oct 20 17:03:40 2013 +0200| [2139895dfa761386a4578616d4d3e9fce4188d0c] | committer: Jean-Baptiste Kempf
Add VP9 support in mkv Close #9341 (cherry picked from commit cd6a14d70d1d1b1ec74fcff273fe0039ce2f337a) (cherry picked from commit 804dfa335337038867f84f305f8f3483a7fade47) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=2139895dfa761386a4578616d4d3e9fce4188d0c --- modules/codec/avcodec/fourcc.c | 4 ++++ modules/demux/mkv/matroska_segment_parse.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 4904f4b..ed49ae2 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -225,6 +225,10 @@ static const struct { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES }, #endif +#if LIBAVCODEC_VERSION_CHECK( 54, 41, 0, 89, 100 ) + { VLC_CODEC_VP9, AV_CODEC_ID_VP9, VIDEO_ES }, +#endif + /* Videogames Codecs */ { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 2988f71..c9d2c9d 100644 --- 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" ) ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
