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/vidix/pci.c b/vidix/pci.c
index 7ccedb9adb..a68eae7e32 100644
--- a/vidix/pci.c
+++ b/vidix/pci.c
@@ -107,7 +107,7 @@ static __inline__ unsigned long
 static swapl(unsigned long val)
 {
 	unsigned char *p = (unsigned char *)&val;
-	return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0] << 0));
+	return (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0] << 0);
 }
  
  
@@ -534,7 +534,7 @@ int pci_scan(pciinfo_t *pci_list,unsigned *num_pci)
  
     ret = enable_os_io();
     if (ret != 0)
-	return(ret);
+	return ret;
 
     if((pcr._configtype = pci_config_type()) == 0xFFFF) return ENODEV;
  
@@ -713,17 +713,17 @@ int pci_config_read(unsigned char bus, unsigned char dev, unsigned char func,
     if (len != 4)
     {
 	fprintf(stderr,"pci_config_read: Reading non-dword not supported!\n");
-	return(ENOTSUP);
+	return ENOTSUP;
     }
     
     ret = enable_os_io();
     if (ret != 0)
-	return(ret);
+	return ret;
     ret = pci_config_read_long(bus, dev, func, cmd);
     disable_os_io();
 
     *val = ret;
-    return(0);
+    return 0;
 }
 
 int enable_app_io( void )