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, 6 insertions, 6 deletions

diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 4838165da1..2b35d6abfe 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -257,7 +257,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_h
     ShowWindow(hWnd,SW_SHOW);
     if(vo_fs)ShowWindow(hWndFS,SW_SHOW);
     
-    return(0);
+    return 0;
 }
 
 static void check_events(void){
@@ -289,17 +289,17 @@ static int draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){
     UNUSED(x);
     UNUSED(y);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_slice!\n");
-    return(-1);
+    return -1;
 }
 
 static int draw_frame(uint8_t *src[]){
     UNUSED(src);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n");
-    return(-1);
+    return -1;
 }
 
 static int query_format(uint32_t format){
-  return(vidix_query_fourcc(format));
+  return vidix_query_fourcc(format);
 }
 
 static void uninit(void){
@@ -325,9 +325,9 @@ static int preinit(const char *arg){
     }
 
     if (vidix_preinit(vidix_name, video_out_winvidix.old_functions) != 0)
-	return(1);
+	return 1;
 
-    return(0);
+    return 0;
 }
 
 static int control(uint32_t request, void *data){