video: remove RGB32/BGR32 aliases

They are sort of confusing, and they hide the fact that they have an
alpha component. Using the actual formats directly is no problem, sicne
these were useful only for big endian systems, something we can't test
anyway.

3 files changed, 3 insertions, 12 deletions

diff --git a/video/img_format.h b/video/img_format.h
index 158fdb9df9..f3d9750585 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -251,15 +251,6 @@ enum mp_imgfmt {
     IMGFMT_AVPIXFMT_END = IMGFMT_AVPIXFMT_START + 500,
 
     IMGFMT_END,
-
-    // Redundant format aliases for native endian access
-
-    // The IMGFMT_RGB32 and IMGFMT_BGR32 formats provide bit-shift access to
-    // normally byte-accessed formats:
-    // IMGFMT_RGB32 = r | (g << 8) | (b << 16) | (a << 24)
-    // IMGFMT_BGR32 = b | (g << 8) | (r << 16) | (a << 24)
-    IMGFMT_RGB32   = MP_SELECT_LE_BE(IMGFMT_RGBA, IMGFMT_ABGR),
-    IMGFMT_BGR32   = MP_SELECT_LE_BE(IMGFMT_BGRA, IMGFMT_ARGB),
 };
 
 static inline bool IMGFMT_IS_RGB(int fmt)
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 455c3faafd..a622921a51 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -211,8 +211,8 @@ static const struct fmt_entry fmt_table[] = {
     // packed YUV
     {IMGFMT_UYVY,  D3DFMT_UYVY},
     // packed RGB
-    {IMGFMT_BGR32, D3DFMT_X8R8G8B8},
-    {IMGFMT_RGB32, D3DFMT_X8B8G8R8},
+    {IMGFMT_BGR0, D3DFMT_X8R8G8B8},
+    {IMGFMT_RGB0, D3DFMT_X8B8G8R8},
     {IMGFMT_BGR24, D3DFMT_R8G8B8}, //untested
     {IMGFMT_RGB565, D3DFMT_R5G6B5},
     // grayscale (can be considered both packed and planar)
diff --git a/video/vdpau.c b/video/vdpau.c
index 6e3d0ac8a9..4701cac85e 100644
--- a/video/vdpau.c
+++ b/video/vdpau.c
@@ -456,7 +456,7 @@ bool mp_vdpau_get_rgb_format(int imgfmt, VdpRGBAFormat *out_rgba_format)
     VdpRGBAFormat format = (VdpRGBAFormat)-1;
 
     switch (imgfmt) {
-    case IMGFMT_BGR32:
+    case IMGFMT_BGRA:
         format = VDP_RGBA_FORMAT_B8G8R8A8; break;
     default:
         return false;