diff -dru MPlayer-0.93.orig/Gui/mplayer/gtk/about.c MPlayer-0.93/Gui/mplayer/gtk/about.c --- MPlayer-0.93.orig/Gui/mplayer/gtk/about.c 2003-02-21 10:38:53.000000000 +0100 +++ MPlayer-0.93/Gui/mplayer/gtk/about.c 2008-03-21 15:03:54.000000000 +0100 @@ -71,7 +71,7 @@ gtk_widget_set_name( AboutText,"AboutText" ); gtk_widget_show( AboutText ); gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText ); - gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, + gtk_text_insert(AboutText,NULL,NULL,NULL, "\n" MSGTR_ABOUT_UHU " (http://www.uhulinux.hu/)\n" diff -dru MPlayer-0.93.orig/configure MPlayer-0.93/configure --- MPlayer-0.93.orig/configure 2004-07-01 12:22:26.000000000 +0200 +++ MPlayer-0.93/configure 2008-03-21 15:03:56.000000000 +0100 @@ -4787,7 +4787,8 @@ elif ( gtk12-config --version ) >/dev/null 2>&1 ; then _gtkconfig="gtk12-config" else - die "the GUI requires GTK (which was not found)" +# die "the GUI requires GTK (which was not found)" + _gtkconfig="pkg-config gtk+-2.0" fi fi _gtk=`$_gtkconfig --version 2>&1` @@ -4803,7 +4804,8 @@ elif ( glib12-config --version ) >/dev/null 2>&1 ; then _glibconfig="glib12-config" else - die "the GUI requires GLIB (which was not found)" +# die "the GUI requires GLIB (which was not found)" + _glibconfig="pkg-config glib-2.0" fi fi _glib=`$_glibconfig --version 2>&1` diff -dru MPlayer-0.93.orig/libaf/af_format.c MPlayer-0.93/libaf/af_format.c --- MPlayer-0.93.orig/libaf/af_format.c 2003-01-18 18:31:58.000000000 +0100 +++ MPlayer-0.93/libaf/af_format.c 2008-03-21 15:03:57.000000000 +0100 @@ -234,7 +234,7 @@ { if(af->data) free(af->data); - (int)af->setup = 0; + af->setup = 0; } // Filter data through filter diff -dru MPlayer-0.93.orig/libao2/ao_oss.c MPlayer-0.93/libao2/ao_oss.c --- MPlayer-0.93.orig/libao2/ao_oss.c 2003-03-22 17:33:00.000000000 +0100 +++ MPlayer-0.93/libao2/ao_oss.c 2008-03-21 15:03:58.000000000 +0100 @@ -45,7 +45,7 @@ dsp=(char*)arg; return CONTROL_OK; case AOCONTROL_GET_DEVICE: - (char*)arg=dsp; + arg=dsp; return CONTROL_OK; case AOCONTROL_QUERY_FORMAT: return CONTROL_TRUE; diff -dru MPlayer-0.93.orig/libmpcodecs/native/RTjpegN.c MPlayer-0.93/libmpcodecs/native/RTjpegN.c --- MPlayer-0.93.orig/libmpcodecs/native/RTjpegN.c 2002-06-08 00:43:27.000000000 +0200 +++ MPlayer-0.93/libmpcodecs/native/RTjpegN.c 2008-03-21 15:03:59.000000000 +0100 @@ -159,7 +159,7 @@ // return 2; // first byte allways written - (__u8)strm[0]= + strm[0]= (__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]); @@ -169,7 +169,7 @@ bitten = ((unsigned char)ci) << 2; if (ci==0) { - (__u8)strm[1]= bitten; + strm[1]= bitten; co = 2; return (int)co; } @@ -198,7 +198,7 @@ } if( bitoff == 0 ) { - (__u8)strm[co]= bitten; + strm[co]= bitten; bitten = 0; bitoff = 8; co++; @@ -210,7 +210,7 @@ /* ci must be 0 */ if(bitoff != 6) { - (__u8)strm[co]= bitten; + strm[co]= bitten; co++; } @@ -227,7 +227,7 @@ break; case 2: case 0: - (__u8)strm[co]= bitten; + strm[co]= bitten; bitoff = 4; co++; bitten = 0; // clear half nibble values in bitten @@ -248,7 +248,7 @@ bitten |= (ZZvalue&0xf)<width = (int)*(void **)arg; return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_GET_WIDTH: - (int)*(void **)arg = priv->width; + arg = priv->width; return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_SET_HEIGHT: priv->height = (int)*(void **)arg; return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_GET_HEIGHT: - (int)*(void **)arg = priv->height; + arg = priv->height; return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_CHK_WIDTH: case TVI_CONTROL_VID_CHK_HEIGHT: diff -dru MPlayer-0.93.orig/libvo/gtf.c MPlayer-0.93/libvo/gtf.c --- MPlayer-0.93.orig/libvo/gtf.c 2002-08-23 01:03:50.000000000 +0200 +++ MPlayer-0.93/libvo/gtf.c 2008-03-21 15:04:02.000000000 +0100 @@ -24,10 +24,12 @@ static GTF_constants GTF_given_constants = { 3.0,550.0,1,8,1.8,8,40,20,128,600 }; +#if 0 static double round(double v) { return floor(v + 0.5); } +#endif static void GetRoundedConstants(GTF_constants *c) { diff -dru MPlayer-0.93.orig/libvo/vo_dga.c MPlayer-0.93/libvo/vo_dga.c --- MPlayer-0.93.orig/libvo/vo_dga.c 2003-02-04 17:14:54.000000000 +0100 +++ MPlayer-0.93/libvo/vo_dga.c 2008-03-21 15:04:03.000000000 +0100 @@ -376,11 +376,11 @@ int i,k,l,m; for(i = 0; i< vo_dga_lines; i++ ){ for(k = 0; k< vo_dga_src_width; k+=2 ){ - l = *(((uint32_t *)s)++); + l = *(s++); m = (l & 0xff000000)>> 24 ; - *(((uint32_t *)d)++) = (l & 0x00ffffff); // | 0x80000000; - m |= *(((uint16_t *)s)++) << 8; - *(((uint32_t *)d)++) = m; // | 0x80000000 ; + *(d++) = (l & 0x00ffffff); // | 0x80000000; + m |= *(s++) << 8; + *(d++) = m; // | 0x80000000 ; } d+= vp_skip; } diff -dru MPlayer-0.93.orig/libvo/x11_common.c MPlayer-0.93/libvo/x11_common.c --- MPlayer-0.93.orig/libvo/x11_common.c 2003-02-10 21:48:59.000000000 +0100 +++ MPlayer-0.93/libvo/x11_common.c 2008-03-21 15:04:04.000000000 +0100 @@ -484,8 +484,10 @@ long state; } MotifWmHints; +#if 0 extern MotifWmHints vo_MotifWmHints; extern Atom vo_MotifHints; +#endif extern int vo_depthonscreen; extern int vo_screenwidth; extern int vo_screenheight; diff -dru MPlayer-0.93.orig/postproc/swscale.c MPlayer-0.93/postproc/swscale.c --- MPlayer-0.93.orig/postproc/swscale.c 2003-02-01 01:48:33.000000000 +0100 +++ MPlayer-0.93/postproc/swscale.c 2008-03-21 15:04:04.000000000 +0100 @@ -526,7 +526,7 @@ ((uint8_t*)dest)[3]= r[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[5]= b[Y2];\ - ((uint8_t*)dest)+=6;\ + dest+=6;\ }\ break;\ case IMGFMT_BGR24:\ @@ -537,7 +537,7 @@ ((uint8_t*)dest)[3]= b[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[5]= r[Y2];\ - ((uint8_t*)dest)+=6;\ + dest+=6;\ }\ break;\ case IMGFMT_RGB16:\ @@ -701,7 +701,7 @@ ((uint8_t*)dest)[3]= r[Y2]; ((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[5]= b[Y2]; - ((uint8_t*)dest)+=6; + (dest)+=6; } break; case IMGFMT_BGR24: @@ -712,7 +712,7 @@ ((uint8_t*)dest)[3]= b[Y2]; ((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[5]= r[Y2]; - ((uint8_t*)dest)+=6; + (dest)+=6; } break; case IMGFMT_RGB16: diff -dru MPlayer-0.93.orig/vobsub.c MPlayer-0.93/vobsub.c --- MPlayer-0.93.orig/vobsub.c 2003-01-03 13:26:15.000000000 +0100 +++ MPlayer-0.93/vobsub.c 2008-03-21 15:04:05.000000000 +0100 @@ -200,6 +200,7 @@ /**********************************************************************/ +#if 0 static ssize_t getline(char **lineptr, size_t *n, rar_stream_t *stream) { @@ -239,6 +240,7 @@ (*lineptr)[res] = 0; return res; } +#endif /********************************************************************** * MPEG parsing