vlc | branch: master | Denis Charmet <[email protected]> | Sat Oct 19 20:02:50 2013 +0200| [04e5cf986fae141a874e5a0235a12b002cbe497a] | committer: Denis Charmet
Add HEVC support in MKV > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04e5cf986fae141a874e5a0235a12b002cbe497a --- modules/codec/avcodec/fourcc.c | 1 + modules/demux/mkv/matroska_segment_parse.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 3746ac8..0b7a7b4 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -62,6 +62,7 @@ static const struct { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1, VIDEO_ES }, { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3, VIDEO_ES }, + { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES }, { VLC_CODEC_H264, AV_CODEC_ID_H264, VIDEO_ES }, { VLC_CODEC_H263, AV_CODEC_ID_H263, VIDEO_ES }, { VLC_CODEC_H263I, AV_CODEC_ID_H263I,VIDEO_ES }, diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 3b058de..2988f71 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -1365,6 +1365,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk ) fill_extra_data( p_tk, 0 ); } } + else if( !strncmp( p_tk->psz_codec, "V_MPEGH/ISO/HEVC", 16) ) + { + p_tk->fmt.i_codec = VLC_CODEC_HEVC; + fill_extra_data( p_tk, 0 ); + } else if( !strcmp( p_tk->psz_codec, "V_QUICKTIME" ) ) { MP4_Box_t *p_box = (MP4_Box_t*)xmalloc( sizeof( MP4_Box_t ) ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
