vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Oct 20 16:12:36 2013 +0200| [6f7d9be50b96a694602878985b2f0228138137c9] | committer: Jean-Baptiste Kempf
Avcodec: move h265 mapping further down in the list > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f7d9be50b96a694602878985b2f0228138137c9 --- modules/codec/avcodec/fourcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 6059739..a3f5377 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -61,9 +61,6 @@ static const struct { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1, VIDEO_ES }, { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3, VIDEO_ES }, -#ifdef AV_CODEC_ID_H265 - { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES }, -#endif { 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 }, @@ -224,6 +221,10 @@ static const struct { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES }, #endif +#ifdef AV_CODEC_ID_H265 // FFmpeg 55.37.100 + { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES }, +#endif + /* Videogames Codecs */ { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
