diff options
| author |  wm4 <wm4@nowhere> | 2014-06-14 10:03:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-14 10:03:04 +0200 |
| commit | a9538e17ad8b66112239fab1b63c88de745d2134 (patch) | |
| tree | 8d0072bf9f678604833330dfd0184ad836daf261 /video/out/vo_sdl.c | |
| parent | 6ab72f976035f094406584795f680d2de8761c2b (diff) | |
video: synchronize mpv rgb pixel format names with ffmpeg names
This affects packed RGB formats up to 16 bits per pixel. The old mplayer
names used LSB-to-MSB order, while FFmpeg (and some other libraries) use
MSB-to-LSB.
Nothing should change with this commit, i.e. no bit order or endian bugs
should be added or fixed. In some cases, the name stays the same, even
though the byte order changes, e.g. RGB8->BGR8 and BGR8->RGB8, and this
affects the user-visible names too; this might cause confusion.
Diffstat (limited to 'video/out/vo_sdl.c')
| -rw-r--r-- | video/out/vo_sdl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 9696520b83..e31dfdc8f2 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -69,11 +69,11 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_BGR24, IMGFMT_BGR24, 0}, {SDL_PIXELFORMAT_RGB888, IMGFMT_RGB24, 0}, {SDL_PIXELFORMAT_BGR888, IMGFMT_BGR24, 0}, - {SDL_PIXELFORMAT_RGB565, IMGFMT_RGB16, 0}, - {SDL_PIXELFORMAT_BGR565, IMGFMT_BGR16, 0}, - {SDL_PIXELFORMAT_RGB555, IMGFMT_RGB15, 0}, - {SDL_PIXELFORMAT_BGR555, IMGFMT_BGR15, 0}, - {SDL_PIXELFORMAT_RGB444, IMGFMT_RGB12, 0} + {SDL_PIXELFORMAT_RGB565, IMGFMT_BGR565, 0}, + {SDL_PIXELFORMAT_BGR565, IMGFMT_RGB565, 0}, + {SDL_PIXELFORMAT_RGB555, IMGFMT_BGR555, 0}, + {SDL_PIXELFORMAT_BGR555, IMGFMT_RGB555, 0}, + {SDL_PIXELFORMAT_RGB444, IMGFMT_BGR444, 0} #else {SDL_PIXELFORMAT_RGBX8888, IMGFMT_ABGR, 0}, // has no alpha -> bad for OSD {SDL_PIXELFORMAT_BGRX8888, IMGFMT_ARGB, 0}, // has no alpha -> bad for OSD @@ -85,11 +85,11 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_BGR24, IMGFMT_BGR24, 0}, {SDL_PIXELFORMAT_RGB888, IMGFMT_BGR24, 0}, {SDL_PIXELFORMAT_BGR888, IMGFMT_RGB24, 0}, - {SDL_PIXELFORMAT_RGB565, IMGFMT_BGR16, 0}, - {SDL_PIXELFORMAT_BGR565, IMGFMT_RGB16, 0}, - {SDL_PIXELFORMAT_RGB555, IMGFMT_BGR15, 0}, - {SDL_PIXELFORMAT_BGR555, IMGFMT_RGB15, 0}, - {SDL_PIXELFORMAT_RGB444, IMGFMT_BGR12, 0} + {SDL_PIXELFORMAT_RGB565, IMGFMT_RGB565, 0}, + {SDL_PIXELFORMAT_BGR565, IMGFMT_RGB565, 0}, + {SDL_PIXELFORMAT_RGB555, IMGFMT_RGB555, 0}, + {SDL_PIXELFORMAT_BGR555, IMGFMT_BGR555, 0}, + {SDL_PIXELFORMAT_RGB444, IMGFMT_RGB444, 0} #endif }; |