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

diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index b2c4b518ba..9293ee4b8d 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -89,7 +89,7 @@ int set_video_colors(sh_video_t *sh_video, const char *item, int value)
     if (vf) {
         int ret = vf->control(vf, VFCTRL_SET_EQUALIZER, &data);
         if (ret == CONTROL_TRUE)
-            return (1);
+            return 1;
     }
     /* try software control */
     const struct vd_functions *vd = sh_video->vd_driver;
@@ -114,7 +114,7 @@ int get_video_colors(sh_video_t *sh_video, const char *item, int *value)
         int ret = vf->control(vf, VFCTRL_GET_EQUALIZER, &data);
         if (ret == CONTROL_TRUE) {
             *value = data.value;
-            return (1);
+            return 1;
         }
     }
     /* try software control */
@@ -133,7 +133,7 @@ int set_rectangle(sh_video_t *sh_video, int param, int value)
     if (vf) {
         int ret = vf->control(vf, VFCTRL_CHANGE_RECTANGLE, data);
         if (ret)
-            return (1);
+            return 1;
     }
     return 0;
 }