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

diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c
index 88dc032d33..772ee5b0c5 100644
--- a/loader/qtx/qtxload.c
+++ b/loader/qtx/qtxload.c
@@ -17,7 +17,7 @@ ComponentResult ComponentDummy(
 	params, globals, ComponentDispatch);
     printf(" Dummy: global datas: %p\n", *globals);
     printf(" Dummy: returning 0\n");
-    return(0);
+    return 0;
 }
 
 char *get_path(const char* x){  return strdup(x);}