From a9538e17ad8b66112239fab1b63c88de745d2134 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 14 Jun 2014 10:03:04 +0200 Subject: 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. --- video/fmt-conversion.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'video/fmt-conversion.c') diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 88e10c924e..44fafa631f 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -30,31 +30,31 @@ static const struct { {IMGFMT_ARGB, AV_PIX_FMT_ARGB}, {IMGFMT_BGRA, AV_PIX_FMT_BGRA}, {IMGFMT_BGR24, AV_PIX_FMT_BGR24}, - {IMGFMT_BGR16_BE, AV_PIX_FMT_RGB565BE}, - {IMGFMT_BGR16_LE, AV_PIX_FMT_RGB565LE}, - {IMGFMT_BGR15_BE, AV_PIX_FMT_RGB555BE}, - {IMGFMT_BGR15_LE, AV_PIX_FMT_RGB555LE}, - {IMGFMT_BGR12_BE, AV_PIX_FMT_RGB444BE}, - {IMGFMT_BGR12_LE, AV_PIX_FMT_RGB444LE}, - {IMGFMT_BGR8, AV_PIX_FMT_RGB8}, - {IMGFMT_BGR4, AV_PIX_FMT_RGB4}, + {IMGFMT_RGB565_BE, AV_PIX_FMT_RGB565BE}, + {IMGFMT_RGB565_LE, AV_PIX_FMT_RGB565LE}, + {IMGFMT_RGB555_BE, AV_PIX_FMT_RGB555BE}, + {IMGFMT_RGB555_LE, AV_PIX_FMT_RGB555LE}, + {IMGFMT_RGB444_BE, AV_PIX_FMT_RGB444BE}, + {IMGFMT_RGB444_LE, AV_PIX_FMT_RGB444LE}, + {IMGFMT_RGB8, AV_PIX_FMT_RGB8}, + {IMGFMT_RGB4, AV_PIX_FMT_RGB4}, {IMGFMT_MONO, AV_PIX_FMT_MONOBLACK}, {IMGFMT_MONO_W, AV_PIX_FMT_MONOWHITE}, - {IMGFMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE}, - {IMGFMT_BGR4_BYTE, AV_PIX_FMT_RGB4_BYTE}, + {IMGFMT_RGB4_BYTE, AV_PIX_FMT_RGB4_BYTE}, + {IMGFMT_BGR4_BYTE, AV_PIX_FMT_BGR4_BYTE}, {IMGFMT_RGB48_LE, AV_PIX_FMT_RGB48LE}, {IMGFMT_RGB48_BE, AV_PIX_FMT_RGB48BE}, {IMGFMT_ABGR, AV_PIX_FMT_ABGR}, {IMGFMT_RGBA, AV_PIX_FMT_RGBA}, {IMGFMT_RGB24, AV_PIX_FMT_RGB24}, - {IMGFMT_RGB16_BE, AV_PIX_FMT_BGR565BE}, - {IMGFMT_RGB16_LE, AV_PIX_FMT_BGR565LE}, - {IMGFMT_RGB15_BE, AV_PIX_FMT_BGR555BE}, - {IMGFMT_RGB15_LE, AV_PIX_FMT_BGR555LE}, - {IMGFMT_RGB12_BE, AV_PIX_FMT_BGR444BE}, - {IMGFMT_RGB12_LE, AV_PIX_FMT_BGR444LE}, - {IMGFMT_RGB8, AV_PIX_FMT_BGR8}, - {IMGFMT_RGB4, AV_PIX_FMT_BGR4}, + {IMGFMT_BGR565_BE, AV_PIX_FMT_BGR565BE}, + {IMGFMT_BGR565_LE, AV_PIX_FMT_BGR565LE}, + {IMGFMT_BGR555_BE, AV_PIX_FMT_BGR555BE}, + {IMGFMT_BGR555_LE, AV_PIX_FMT_BGR555LE}, + {IMGFMT_BGR444_BE, AV_PIX_FMT_BGR444BE}, + {IMGFMT_BGR444_LE, AV_PIX_FMT_BGR444LE}, + {IMGFMT_BGR8, AV_PIX_FMT_BGR8}, + {IMGFMT_BGR4, AV_PIX_FMT_BGR4}, {IMGFMT_PAL8, AV_PIX_FMT_PAL8}, {IMGFMT_GBRP, AV_PIX_FMT_GBRP}, {IMGFMT_GBRP9_BE, AV_PIX_FMT_GBRP9BE}, -- cgit v1.2.3