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_fbdev.c b/libvo/vo_fbdev.c
index 178f17869a..abe5d9aeeb 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -1038,7 +1038,7 @@ static int query_format(uint32_t format)
 		return 0;
 #ifdef CONFIG_VIDIX
 	if(vidix_name)
-		return (vidix_query_fourcc(format));
+		return vidix_query_fourcc(format);
 #endif
 	if ((format & IMGFMT_BGR_MASK) == IMGFMT_BGR) {
 		int bpp = format & 0xff;
@@ -1141,8 +1141,8 @@ static int preinit(const char *vo_subdevice)
 	    fb_dev_name = strdup(vo_subdevice);
 	}
     }
-    if(!pre_init_err) return (pre_init_err=(fb_preinit(0)?0:-1));
-    return(-1);
+    if(!pre_init_err) return pre_init_err = (fb_preinit(0) ? 0 : -1);
+    return -1;
 }
 
 static uint32_t get_image(mp_image_t *mpi)
@@ -1156,12 +1156,12 @@ static uint32_t get_image(mp_image_t *mpi)
 	(mpi->width != in_width) ||
 	(mpi->height != in_height)
        )
-    return(VO_FALSE);
+    return VO_FALSE;
 
     mpi->planes[0] = center;
     mpi->stride[0] = fb_line_len;
     mpi->flags |= MP_IMGFLAG_DIRECT;
-    return(VO_TRUE);
+    return VO_TRUE;
 }
 
 static int control(uint32_t request, void *data)