RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 01:52:19 +00:00
Code Issues Releases Wiki Activity

applied 64bit patch from Ulrich Hecht <uli at suse dot de>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6165 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-05-23 15:40:08 +00:00
parent cdfc03fab6
commit 5b0b08a392
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libvo/vo_fbdev.c
View File

@ -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

6
libvo/x11_common.c
View File

@ -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;

2
postproc/postprocess.c
View File

@ -638,7 +638,7 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality)
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++;