From a0fce62fd3eb70d1431d15c9b0a39042b4fc65cd Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 30 May 2003 18:05:49 +0000 Subject: [PATCH] warning fixes by Dominik Mierzejewski git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10213 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_dga.c | 2 ++ libvo/vo_x11.c | 2 +- libvo/x11_common.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 458b4a856e..ac3cdccaaf 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -497,6 +497,7 @@ static int check_res( int num, int x, int y, int bpp, // as long as it's above 50 Hz (acki2 on 30/3/2001) || ( + ( (new_x == *old_x) && (new_y == *old_y) && ( @@ -510,6 +511,7 @@ static int check_res( int num, int x, int y, int bpp, new_vbi >= 50 ) ) + ) || // if everything is equal, then use the mode with the lower // stride diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 5418eac285..6b6ea84251 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -262,7 +262,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); } if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ) || - WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual)) + (WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); /* set image size (which is indeed neither the input nor output size), diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 3bb11d9f82..265dc00814 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -105,6 +105,8 @@ XF86VidModeModeInfo **vidmodes=NULL; XF86VidModeModeLine modeline; #endif +int vo_x11_get_fs_type( int supported ); + void vo_hidecursor ( Display *disp , Window win ) { Cursor no_ptr;