[vlc-commits] XCB/XVideo: add RV12, AV16 and AV32

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 15 19:18:47 2011 +0200| [b365966d4c0de8a51eae99901867ea17ddf5ac6b] | committer: Rémi Denis-Courmont

XCB/XVideo: add RV12, AV16 and AV32

Those are not used (currently). This commit is only meant to avoid the
error messages for unknown formats.

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

 modules/video_output/xcb/xvideo.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 139a0bc..63fd70b 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -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;