Merge svn changes up to r26979

Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c

1 files changed, 5 insertions, 5 deletions

diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 36873185c0..522ea8c83a 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -549,7 +549,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 #endif    
 
   vga_setdisplaystart(0);
-  return (0);
+  return 0;
 }
 
 static int draw_slice(uint8_t *image[],int stride[],
@@ -698,7 +698,7 @@ int page;
 
   if(!IMGFMT_IS_BGR(mpi->imgfmt) && !IMGFMT_IS_RGB(mpi->imgfmt) ){ 
     assert(0);//should never happen
-    return(VO_FALSE);
+    return VO_FALSE;
   }
   
   if (
@@ -706,7 +706,7 @@ int page;
    (mpi->flags & MP_IMGFLAG_PLANAR) ||
    (mpi->flags & MP_IMGFLAG_YUV)
       )
-    return(VO_FALSE);
+    return VO_FALSE;
 
 //reading from video memory is horribly slow
   if( !(mpi->flags & MP_IMGFLAG_READABLE) && vo_directrendering &&
@@ -724,9 +724,9 @@ int page;
       mpi->priv=(void *)page;
       if( mp_msg_test(MSGT_VO,MSGL_DBG3) )
         mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: direct render allocated! page=%d\n",page);
-      return(VO_TRUE);
+      return VO_TRUE;
     }
   }
 
-  return(VO_FALSE);
+  return VO_FALSE;
 }