Mercurial > mplayer.hg

changeset 6164:aee9c32349a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
author alex
date Thu, 23 May 2002 15:40:08 +0000
parents 141a082e6da6
children c85bb954289f
files libvo/vo_fbdev.c libvo/x11_common.c postproc/postprocess.c
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Thu May 23 15:27:49 2002 +0000
+++ b/libvo/vo_fbdev.c	Thu May 23 15:40:08 2002 +0000
@@ -52,7 +52,7 @@
 /* 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 @@
 	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 @@
 	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
--- a/libvo/x11_common.c	Thu May 23 15:27:49 2002 +0000
+++ b/libvo/x11_common.c	Thu May 23 15:40:08 2002 +0000
@@ -205,7 +205,7 @@
 #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 @@
   }
 
  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 @@
    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;
    
--- a/postproc/postprocess.c	Thu May 23 15:27:49 2002 +0000
+++ b/postproc/postprocess.c	Thu May 23 15:40:08 2002 +0000
@@ -638,7 +638,7 @@
 				else p--, *p=',';		//not last filter
 
 				plen= strlen(p);
-				spaceLeft= (int)p - (int)temp + plen;
+				spaceLeft= p - temp + plen;
 				if(spaceLeft + newlen  >= GET_MODE_BUFFER_SIZE)
 				{
 					ppMode.error++;