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/ad_twin.c b/libmpcodecs/ad_twin.c
index bd26531ae4..3915101ae4 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -216,7 +216,7 @@ static int bread(char   *data,    /* Output: Output data array */
         }
         iptr = priv->ptr;           /* current file data buffer pointer */
         if ( iptr >= priv->nbuf )   /* If data file is empty then return */
-            return(retval);
+            return retval;
         ibufadr = iptr/BYTE_BIT;      /* current file data buffer address */
         ibufbit = iptr%BYTE_BIT;      /* current file data buffer bit */
         /*  tmpdat = stream->buf[ibufadr] >> (BYTE_BIT-ibufbit-1); */
@@ -235,7 +235,7 @@ static int bread(char   *data,    /* Output: Output data array */
         }
         ++retval;
     }
-    return(retval);
+    return retval;
 }
 
 #define BITS_INT    (sizeof(int)*8)
@@ -266,7 +266,7 @@ static int get_bstm(int *data,          /* Input: input data */
         mask >>= 1;
     }
     *data = work;
-    return(retval);
+    return retval;
 }
 
 static int GetVqInfo( tvqConfInfoSubBlock *cfg,