[vlc-commits] fourcc: remove unsupported RGBT and RGBA16

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jun  9 19:21:21 2014 +0300| [fe6a5688fb0fa267bbb391e8e87f0d13b6c3042c] | committer: Rémi Denis-Courmont

fourcc: remove unsupported RGBT and RGBA16

This was found on some versions of OMAP XV but never truly supported
by VLC (no decoder and no conversion...).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe6a5688fb0fa267bbb391e8e87f0d13b6c3042c
---

 include/vlc_fourcc.h              |    4 ----
 modules/video_output/xcb/xvideo.c |    4 ----
 src/misc/fourcc.c                 |    7 +------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 5821f42..debb5c9 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -210,12 +210,8 @@
 #define VLC_CODEC_RGB8            VLC_FOURCC('R','G','B','8')
 /* 12 bits RGB padded to 16 bits */
 #define VLC_CODEC_RGB12           VLC_FOURCC('R','V','1','2')
-/* 16 bits RGBA (12 bits RGB + 4 bits alpha) */
-#define VLC_CODEC_RGBA16          VLC_FOURCC('A','V','1','6')
 /* 15 bits RGB padded to 16 bits */
 #define VLC_CODEC_RGB15           VLC_FOURCC('R','V','1','5')
-/* 16 bits RGBA (15 bits RGB + 1 bit alpha)  */
-#define VLC_CODEC_RGBT            VLC_FOURCC('R','G','B','T')
 /* 16 bits RGB */
 #define VLC_CODEC_RGB16           VLC_FOURCC('R','V','1','6')
 /* 24 bits RGB */
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 2f3c16a..cf1353f 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -162,14 +162,10 @@ static vlc_fourcc_t ParseFormat (vlc_object_t *obj,
               case 15:
                 if (f->byte_order != ORDER)
                     return 0; /* Mixed endian! */
-                if (f->bpp == 16 && f->depth == 16)
-                    return VLC_CODEC_RGBT;
                 if (f->bpp == 16 && f->depth == 15)
                     return VLC_CODEC_RGB15;
                 break;
               case 12:
-                if (f->bpp == 16 && f->depth == 16)
-                    return VLC_CODEC_RGBA16;
                 if (f->bpp == 16 && f->depth == 12)
                     return VLC_CODEC_RGB12;
                 break;
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 9adefca..da948a5 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -799,12 +799,8 @@ static const staticentry_t p_list_video[] = {
         A("RGB2"),
     B(VLC_CODEC_RGB12, "12 bits RGB"),
         A("RV12"),
-    B(VLC_CODEC_RGBA16, "16 bits RGBA"),
-        A("AV16"),
     B(VLC_CODEC_RGB15, "15 bits RGB"),
         A("RV15"),
-    B(VLC_CODEC_RGBT, "16 bits RGBT"),
-        A("RGBT"),
     B(VLC_CODEC_RGB16, "16 bits RGB"),
         A("RV16"),
     B(VLC_CODEC_RGB24, "24 bits RGB"),
@@ -2086,8 +2082,7 @@ static const struct
 
     { { VLC_CODEC_RGB15, 0 },                  PACKED_FMT(2, 15) },
     { { VLC_CODEC_RGB12, 0 },                  PACKED_FMT(2, 12) },
-    { { VLC_CODEC_RGB16, VLC_CODEC_RGBT,
-        VLC_CODEC_RGBA16, 0 },                 PACKED_FMT(2, 16) },
+    { { VLC_CODEC_RGB16, 0 },                  PACKED_FMT(2, 16) },
     { { VLC_CODEC_RGB24, 0 },                  PACKED_FMT(3, 24) },
     { { VLC_CODEC_RGB32, 0 },                  PACKED_FMT(4, 24) },
     { { VLC_CODEC_RGBA, VLC_CODEC_ARGB,