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/cpudetect.c b/cpudetect.c
index 933f394d49..06287cd525 100644
--- a/cpudetect.c
+++ b/cpudetect.c
@@ -79,7 +79,7 @@ static int has_cpuid(void)
                           : "cc" 
                           );
 
-	return (a!=c);
+	return a != c;
 }
 #endif