From 501eb1fa89ce3bd3a52312e82409313fd99cd94b Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 29 Aug 2004 09:58:07 +0000 Subject: [PATCH] * 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). --- modules/video_chroma/i420_rgb.c | 4 +++- modules/video_output/x11/xcommon.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c index e5e8e338cc..b51454cd03 100644 --- 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 c2cbddcf82..46ac6d8e3f 100644 --- 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: -- 2.39.2