Skip to content

V
vlc-2-2
Commit 49bcf08a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Cleanup. 

SHM is autodetected, so there is not point in disabling it by force.
parent 7503582f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 17 deletions
modules/video_output/x11/xcommon.c
View file @ 49bcf08a
...@@ -2666,9 +2666,6 @@ static int InitDisplay( vout_thread_t *p_vout ) ...@@ -2666,9 +2666,6 @@ static int InitDisplay( vout_thread_t *p_vout )
if( config_GetInt( p_vout, MODULE_STRING "-shm" ) ) if( config_GetInt( p_vout, MODULE_STRING "-shm" ) )
{ {
# ifdef __APPLE__
/* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */
# else
int major, evt, err; int major, evt, err;
if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major, if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major,
...@@ -2688,22 +2685,11 @@ static int InitDisplay( vout_thread_t *p_vout ) ...@@ -2688,22 +2685,11 @@ static int InitDisplay( vout_thread_t *p_vout )
major, minor, pixmaps ? "" : "out", major, minor, pixmaps ? "" : "out",
p_vout->p_sys->i_shm_opcode ); p_vout->p_sys->i_shm_opcode );
} }
# endif
if( !p_vout->p_sys->i_shm_opcode )
{
msg_Warn( p_vout, "XShm video extension is unavailable" );
}
}
else else
{ msg_Warn( p_vout, "XShm video extension not available" );
msg_Dbg( p_vout, "disabling XShm video extension" );
} }
else
#else msg_Dbg( p_vout, "XShm video extension disabled" );
msg_Warn( p_vout, "XShm video extension is unavailable" );
#endif #endif
#ifdef MODULE_NAME_IS_xvideo #ifdef MODULE_NAME_IS_xvideo
......
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