diff options
| author | Niklas Haas <git@haasn.dev> | 2022-01-11 21:03:27 +0100 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2022-01-11 23:45:08 +0200 |
| commit | 9e2c0b8baa3f9ccba997129a1c1023f61611e4dd (patch) | |
| tree | fff3693f77deeef422f91fb817c028ef54f76e63 /video/out/vo_sdl.c | |
| parent | 429402cb087f3a052cb9645af1e42156fd413c6c (diff) | |
| download | mpv-9e2c0b8baa3f9ccba997129a1c1023f61611e4dd.tar.bz2 mpv-9e2c0b8baa3f9ccba997129a1c1023f61611e4dd.tar.xz | |
sub: rename SUBBITMAP_RGBA to SUBBITMAP_BGRA
This was a misnomer, the actual channel order is IMGFMT_BGRA (as the
comment explicitly point out). Rename the enum for consistency.
Diffstat (limited to 'video/out/vo_sdl.c')
| -rw-r--r-- | video/out/vo_sdl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index b50fc6d94c..adfcfb43d8 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -62,7 +62,7 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_RGBX8888, IMGFMT_RGB0, 0}, // has no alpha -> bad for OSD {SDL_PIXELFORMAT_BGR888, IMGFMT_0BGR, 0}, // BGR888 means XBGR8888 {SDL_PIXELFORMAT_BGRX8888, IMGFMT_BGR0, 0}, // has no alpha -> bad for OSD - {SDL_PIXELFORMAT_ARGB8888, IMGFMT_ARGB, 1}, // matches SUBBITMAP_RGBA + {SDL_PIXELFORMAT_ARGB8888, IMGFMT_ARGB, 1}, // matches SUBBITMAP_BGRA {SDL_PIXELFORMAT_RGBA8888, IMGFMT_RGBA, 1}, {SDL_PIXELFORMAT_ABGR8888, IMGFMT_ABGR, 1}, {SDL_PIXELFORMAT_BGRA8888, IMGFMT_BGRA, 1}, @@ -71,7 +71,7 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_RGBX8888, IMGFMT_0BGR, 0}, // has no alpha -> bad for OSD {SDL_PIXELFORMAT_BGR888, IMGFMT_RGB0, 0}, // BGR888 means XBGR8888 {SDL_PIXELFORMAT_BGRX8888, IMGFMT_0RGB, 0}, // has no alpha -> bad for OSD - {SDL_PIXELFORMAT_ARGB8888, IMGFMT_BGRA, 1}, // matches SUBBITMAP_RGBA + {SDL_PIXELFORMAT_ARGB8888, IMGFMT_BGRA, 1}, // matches SUBBITMAP_BGRA {SDL_PIXELFORMAT_RGBA8888, IMGFMT_ABGR, 1}, {SDL_PIXELFORMAT_ABGR8888, IMGFMT_RGBA, 1}, {SDL_PIXELFORMAT_BGRA8888, IMGFMT_ARGB, 1}, @@ -800,7 +800,7 @@ static void draw_osd(struct vo *vo) struct priv *vc = vo->priv; static const bool osdformats[SUBBITMAP_COUNT] = { - [SUBBITMAP_RGBA] = true, + [SUBBITMAP_BGRA] = true, }; osd_draw(vo->osd, vc->osd_res, vc->osd_pts, 0, osdformats, draw_osd_cb, vo); |