diff options
| author |  alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 15:40:08 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 15:40:08 +0000 |
| commit | 5b0b08a392311e065df6d796fdfe1923785800d9 (patch) | |
| tree | 31c57b938b605449f4c79acbd97aa629e08825d0 /libvo | |
| parent | cdfc03fab6400f2bde66c21db70c2c4c38951bc8 (diff) | |
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6165 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_fbdev.c | 5 | ||||
| -rw-r--r-- | libvo/x11_common.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index d3c5c0433a..d759c5062f 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -52,7 +52,7 @@ extern int verbose; /* Name of VIDIX driver */ static const char *vidix_name = NULL; #endif -static int pre_init_err = 0xFFFFFFFEUL; +static signed int pre_init_err = -2; /****************************** * fb.modes support * ******************************/ @@ -912,7 +912,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, fs = fullscreen & 0x01; flip = fullscreen & 0x08; - if(pre_init_err == 0xFFFFFFFEUL) + if(pre_init_err == -2) { printf(FBDEV "Internal fatal error: init() was called before preinit()\n"); return -1; @@ -1347,6 +1347,7 @@ static uint32_t preinit(const char *arg) printf("vo_subdevice: initialization returns: %i\n",pre_init_err); #endif if(!pre_init_err) return (pre_init_err=(fb_preinit()?0:-1)); + return(-1); } #ifdef HAVE_PNG diff --git a/libvo/x11_common.c b/libvo/x11_common.c index b69d8d3c78..d8952ff22b 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -205,7 +205,7 @@ int vo_wm_detect( void ) #if 1 // --- netwm type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); - if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" ); XFree( args ); @@ -702,7 +702,7 @@ void vo_x11_setlayer( int layer ) } type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); - if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) { XEvent e; @@ -721,7 +721,7 @@ void vo_x11_setlayer( int layer ) return; } type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); - if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) { XClientMessageEvent xev; |