]> git.sesse.net Git - vlc/commitdiff
XCB/XVideo: add RV12, AV16 and AV32
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 15 Feb 2011 17:18:47 +0000 (19:18 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 15 Feb 2011 17:20:36 +0000 (19:20 +0200)
Those are not used (currently). This commit is only meant to avoid the
error messages for unknown formats.

modules/video_output/xcb/xvideo.c

index 139a0bccd677a19361c297057d063be36c00f91f..63fd70b71c31bb0ffba40fd2021786c13e885279 100644 (file)
@@ -147,7 +147,7 @@ static vlc_fourcc_t ParseFormat (vout_display_t *vd,
             {
               case 24:
                 if (f->bpp == 32 && f->depth == 32)
-                    return 0; /* ARGB -> VLC cannot do that currently */
+                    return VLC_CODEC_RGBA;
                 if (f->bpp == 32 && f->depth == 24)
                     return VLC_CODEC_RGB32;
                 if (f->bpp == 24 && f->depth == 24)
@@ -161,6 +161,11 @@ static vlc_fourcc_t ParseFormat (vout_display_t *vd,
                 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;
               case 8:
                 if (f->bpp == 8 && f->depth == 8)
                     return VLC_CODEC_RGB8;