Avcodec: move h265 mapping further down in the list

6f7d9be5 · Jean-Baptiste Kempf · 4c4b9547 · 6f7d9be5
Commit 6f7d9be5 authored Oct 20, 2013 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

modules/codec/avcodec/fourcc.c modules/codec/avcodec/fourcc.c +4 -3

No files found.
--- 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 },