* modules/video_output/x11/xcommon.c: 24 bits screen depth uses 32bits per pixels.

* video_chroma/i420_rgb.c: disable RV24 support (which was assuming 32 bits per pixels).

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index e5e8e338cc85460213f6808d0e3400d0f860ed5b..b51454cd03d00bb44408d5f5975d749f78aa0271 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -122,9 +122,11 @@ static int Activate( vlc_object_t *p_this )
                     p_vout->chroma.pf_convert = E_(I420_RGB16);
                     break;
 
-#ifndef WIN32 /* Hmmm, is there only X11 using 32bits per pixel for RV24 ? */
+#if 0
+                /* Hmmm, is there only X11 using 32bits per pixel for RV24 ? */
                 case VLC_FOURCC('R','V','2','4'):
 #endif
+
                 case VLC_FOURCC('R','V','3','2'):
 #if defined (MODULE_NAME_IS_i420_rgb_mmx)
                     /* If we don't have support for the bitmasks, bail out */

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index c2cbddcf828a58dc12f33ef7b044646714115772..46ac6d8e3f539297669da0736228055983f11cfa 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -384,7 +384,6 @@ static int InitVideo( vout_thread_t *p_vout )
         case 16:
             p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break;
         case 24:
-            p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
         case 32:
             p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
         default: