Merge svn changes up to r28087

Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h

5 files changed, 23 insertions, 23 deletions

diff --git a/vidix/dha.h b/vidix/dha.h
index 501215172d..c590103308 100644
--- a/vidix/dha.h
+++ b/vidix/dha.h
@@ -56,29 +56,29 @@ typedef struct pciinfo_s
 }pciinfo_t;
 
 /* needed for mga_vid */
-extern int pci_config_read(unsigned char bus, unsigned char dev, unsigned char func,
+int pci_config_read(unsigned char bus, unsigned char dev, unsigned char func,
 			unsigned char cmd, int len, unsigned long *val);
 			/* Fill array pci_list which must have size MAX_PCI_DEVICES
 			   and return 0 if sucessful */
-extern int  pci_scan(pciinfo_t *pci_list,unsigned *num_card);
+int pci_scan(pciinfo_t *pci_list,unsigned *num_card);
 
 
 	    /* Enables/disables accessing to IO space from application side.
 	       Should return 0 if o'k or errno on error. */
-extern int enable_app_io( void );
-extern int disable_app_io( void );
+int enable_app_io(void);
+int disable_app_io(void);
 
-extern unsigned char  INPORT8(unsigned idx);
-extern unsigned short INPORT16(unsigned idx);
-extern unsigned       INPORT32(unsigned idx);
+unsigned char  INPORT8(unsigned idx);
+unsigned short INPORT16(unsigned idx);
+unsigned       INPORT32(unsigned idx);
 #define INPORT(idx) INPORT32(idx)
-extern void          OUTPORT8(unsigned idx,unsigned char val);
-extern void          OUTPORT16(unsigned idx,unsigned short val);
-extern void          OUTPORT32(unsigned idx,unsigned val);
+void          OUTPORT8(unsigned idx, unsigned char val);
+void          OUTPORT16(unsigned idx, unsigned short val);
+void          OUTPORT32(unsigned idx, unsigned val);
 #define OUTPORT(idx,val) OUTPORT32(idx,val)
 
-extern void *  map_phys_mem(unsigned long base, unsigned long size);
-extern void    unmap_phys_mem(void *ptr, unsigned long size);
+void *  map_phys_mem(unsigned long base, unsigned long size);
+void    unmap_phys_mem(void *ptr, unsigned long size);
 
 /*  These are the region types  */
 #define MTRR_TYPE_UNCACHABLE 0
@@ -86,6 +86,6 @@ extern void    unmap_phys_mem(void *ptr, unsigned long size);
 #define MTRR_TYPE_WRTHROUGH  4
 #define MTRR_TYPE_WRPROT     5
 #define MTRR_TYPE_WRBACK     6
-extern int	mtrr_set_type(unsigned base,unsigned size,int type);
+int mtrr_set_type(unsigned base, unsigned size, int type);
 
 #endif /* MPLAYER_DHA_H */
diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk
index 3d10297652..897ce8e312 100644
--- a/vidix/pci_db2c.awk
+++ b/vidix/pci_db2c.awk
@@ -158,8 +158,8 @@ function print_name_struct(out_file)
    print "\tconst char *\tname;" >out_file
    print "\tconst struct device_id_s *\tdev_list;" >out_file
    print "};" >out_file
-   print "extern const char *pci_vendor_name(unsigned short id);">out_file
-   print "extern const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file
+   print "const char *pci_vendor_name(unsigned short id);">out_file
+   print "const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file
    print "">out_file
    return
 }
diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c
index 1028a6c5db..a2d1d98919 100644
--- a/vidix/sis_vid.c
+++ b/vidix/sis_vid.c
@@ -167,7 +167,7 @@ static unsigned short sis_card_ids[] = {
 
 /** function declarations **/
 
-extern void sis_init_video_bridge(void);
+void sis_init_video_bridge(void);
 
 
 static void set_overlay(SISOverlayPtr pOverlay, int index);
diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h
index 2cc8d01544..5ae5e07a82 100644
--- a/vidix/sysdep/AsmMacros_alpha.h
+++ b/vidix/sysdep/AsmMacros_alpha.h
@@ -66,12 +66,12 @@
 #include <sys/io.h>
 #elif defined (__FreeBSD__)
 #include <sys/types.h>
-extern void outb(u_int32_t port, u_int8_t val);
-extern void outw(u_int32_t port, u_int16_t val);
-extern void outl(u_int32_t port, u_int32_t val);
-extern u_int8_t inb(u_int32_t port);
-extern u_int16_t inw(u_int32_t port);
-extern u_int32_t inl(u_int32_t port);
+void outb(u_int32_t port, u_int8_t val);
+void outw(u_int32_t port, u_int16_t val);
+void outl(u_int32_t port, u_int32_t val);
+u_int8_t inb(u_int32_t port);
+u_int16_t inw(u_int32_t port);
+u_int32_t inl(u_int32_t port);
 #else
 #error This stuff is not ported on your system
 #endif
diff --git a/vidix/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c
index ffa4d2238f..d01cdfd30e 100644
--- a/vidix/sysdep/pci_win32.c
+++ b/vidix/sysdep/pci_win32.c
@@ -31,7 +31,7 @@
 #include "vidix/dhahelperwin/dhahelper.h"
 
 static HANDLE hDriver;
-extern int IsWinNT();
+int IsWinNT();