[vlc-commits] [Git][videolan/vlc][master] vlc_fourcc: Fix regression introduced in 1ea223dff935004e110542a6894c8b22d602876d

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
235ba564 by Gianfranco Costamagna at 2023-10-12T08:52:45+00:00
vlc_fourcc: Fix regression introduced in 1ea223dff935004e110542a6894c8b22d602876d

VLC_CODEC_BGR555 should be defined on BE architectures as VLC_CODEC_BGR555BE and not VLC_CODEC_BGR565BE

Fixes build failure:

video_filter/blend.cpp: In constructor ‘{anonymous}::CPictureRGB16::CPictureRGB16(const {anonymous}::CPicture&)’:
video_filter/blend.cpp:357:9: error: duplicate case value
  357 |         case VLC_CODEC_BGR555:
      |         ^~~~
video_filter/blend.cpp:347:9: note: previously used here
  347 |         case VLC_CODEC_BGR565:
      |         ^~~~
video_filter/blend.cpp: In constructor ‘{anonymous}::convertRgbToRgbSmall::convertRgbToRgbSmall(const video_format_t*, const video_format_t*)’:
video_filter/blend.cpp:506:9: error: duplicate case value
  506 |         case VLC_CODEC_BGR555:
      |         ^~~~
video_filter/blend.cpp:496:9: note: previously used here
  496 |         case VLC_CODEC_BGR565:
      |         ^~~~

- - - - -


1 changed file:

- include/vlc_fourcc.h


Changes:

=====================================
include/vlc_fourcc.h
=====================================
@@ -384,7 +384,7 @@
 /* 15-bit RGB with host endianness */
 #define VLC_CODEC_RGB555    VLC_CODEC_RGB555BE
 /* 15-bit BGR with host endianness */
-#define VLC_CODEC_BGR555    VLC_CODEC_BGR565BE
+#define VLC_CODEC_BGR555    VLC_CODEC_BGR555BE
 #else
 /* 15-bit RGB with host endianness */
 #define VLC_CODEC_RGB555    VLC_CODEC_RGB555LE



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/235ba564cf74e4bcef7fad9c984274b326f046a7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/235ba564cf74e4bcef7fad9c984274b326f046a7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance