Skip to content
Snippets Groups Projects
Commit 235ba564 authored by locutusofborg's avatar locutusofborg Committed by Steve Lhomme
Browse files

vlc_fourcc: Fix regression introduced in 1ea223df

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:
      |         ^~~~
parent 2a5e910d
No related branches found
No related tags found
1 merge request!4366vlc_fourcc: Fix regression introduced in 1ea223dff935004e110542a6894c8b22d602876d
Pipeline #394496 passed with stage
in 32 minutes and 10 seconds
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment