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/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c
index 76daa4cc9f..c5b4b90e96 100644
--- a/libmpcodecs/vf_tile.c
+++ b/libmpcodecs/vf_tile.c
@@ -172,7 +172,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
     }
     else {
         /* Skip the frame */
-        return(0);
+        return 0;
     }
 }
 
@@ -237,7 +237,7 @@ static int parse_int(char **s, int *rt, int def_val)
         }
         else if (**s != '\0') {
             /* Error, we got some wrong char */
-            return(1);
+            return 1;
         }
     }
     else {
@@ -245,7 +245,7 @@ static int parse_int(char **s, int *rt, int def_val)
     }
 
     *rt = t;
-    return(0);
+    return 0;
 
 }
 
@@ -263,7 +263,7 @@ static int open(vf_instance_t *vf, char* args)
     /* Private data */
     vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
     if (p == NULL) {
-        return(0);
+        return 0;
     }
 
     if (args == NULL) {
@@ -280,7 +280,7 @@ static int open(vf_instance_t *vf, char* args)
 
     if (er) {
         mp_msg(MSGT_VFILTER, MSGL_ERR, MSGTR_MPCODECS_ErrorParsingArgument);
-        return(0);
+        return 0;
     }
     /* Load some default */
     if ((p->xytile <= 0) || (p->xytile > p->xtile * p->ytile)) {