Skip to content

V
vlc
Commit 65ce3ece authored by Eric Petit's avatar Eric Petit
Browse files
Options

modules/video_output/x11/xcommon.c : compile fix for gcc != 3

parent 7d5b13c6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
modules/video_output/x11/xcommon.c
View file @ 65ce3ece
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins * xcommon.c: Functions common to the X11 and XVideo plugins
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.19 2003/05/26 19:06:47 gbazin Exp $ * $Id: xcommon.c,v 1.20 2003/05/28 00:52:05 titer Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -532,6 +532,8 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -532,6 +532,8 @@ static int ManageVideo( vout_thread_t *p_vout )
case XK_Menu: case XK_Menu:
{ {
intf_thread_t *p_intf; intf_thread_t *p_intf;
playlist_t * p_playlist;
p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF, p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_intf ) if( p_intf )
...@@ -540,8 +542,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -540,8 +542,7 @@ static int ManageVideo( vout_thread_t *p_vout )
vlc_object_release( p_intf ); vlc_object_release( p_intf );
} }
playlist_t *p_playlist = p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist != NULL ) if( p_playlist != NULL )
{ {
...@@ -676,6 +677,8 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -676,6 +677,8 @@ static int ManageVideo( vout_thread_t *p_vout )
case Button3: case Button3:
{ {
intf_thread_t *p_intf; intf_thread_t *p_intf;
playlist_t *p_playlist;
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~4; val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
...@@ -687,8 +690,8 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -687,8 +690,8 @@ static int ManageVideo( vout_thread_t *p_vout )
vlc_object_release( p_intf ); vlc_object_release( p_intf );
} }
playlist_t *p_playlist = p_playlist = vlc_object_find( p_intf,
vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist != NULL ) if( p_playlist != NULL )
{ {
......
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