Commit 501eb1fa authored by gbazin's avatar gbazin
Browse files

* 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).
parent ffe4c977
...@@ -122,9 +122,11 @@ static int Activate( vlc_object_t *p_this ) ...@@ -122,9 +122,11 @@ static int Activate( vlc_object_t *p_this )
p_vout->chroma.pf_convert = E_(I420_RGB16); p_vout->chroma.pf_convert = E_(I420_RGB16);
break; 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'): case VLC_FOURCC('R','V','2','4'):
#endif #endif
case VLC_FOURCC('R','V','3','2'): case VLC_FOURCC('R','V','3','2'):
#if defined (MODULE_NAME_IS_i420_rgb_mmx) #if defined (MODULE_NAME_IS_i420_rgb_mmx)
/* If we don't have support for the bitmasks, bail out */ /* If we don't have support for the bitmasks, bail out */
......
...@@ -384,7 +384,6 @@ static int InitVideo( vout_thread_t *p_vout ) ...@@ -384,7 +384,6 @@ static int InitVideo( vout_thread_t *p_vout )
case 16: case 16:
p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break; p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break;
case 24: case 24:
p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
case 32: case 32:
p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break; p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
default: default:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment