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

3 files changed, 29 insertions, 30 deletions

diff --git a/libaf/af_format.h b/libaf/af_format.h
index 1e29f3d437..dee7503dc2 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -85,11 +85,11 @@
 
 #define AF_FORMAT_UNKNOWN (-1)
 
-extern int af_str2fmt(const char *str);
-extern int af_str2fmt_short(const char *str);
-extern int af_fmt2bits(int format);
-extern int af_bits2fmt(int bits);
-extern char* af_fmt2str(int format, char* str, int size);
-extern const char* af_fmt2str_short(int format);
+int af_str2fmt(const char *str);
+int af_str2fmt_short(const char *str);
+int af_fmt2bits(int format);
+int af_bits2fmt(int bits);
+char* af_fmt2str(int format, char* str, int size);
+const char* af_fmt2str_short(int format);
 
 #endif /* MPLAYER_AF_FORMAT_H */
diff --git a/libaf/filter.h b/libaf/filter.h
index 0993f86cce..fe92be8e9c 100644
--- a/libaf/filter.h
+++ b/libaf/filter.h
@@ -44,28 +44,27 @@
 #define ODD         0x00000010 // Make filter HP
 
 // Exported functions
-extern FLOAT_TYPE af_filter_fir(unsigned int n, const FLOAT_TYPE* w, const FLOAT_TYPE* x);
+FLOAT_TYPE af_filter_fir(unsigned int n, const FLOAT_TYPE* w, const FLOAT_TYPE* x);
 
-extern FLOAT_TYPE* af_filter_pfir(unsigned int n, unsigned int k,
-                                  unsigned int xi, const FLOAT_TYPE** w,
-                                  const FLOAT_TYPE** x, FLOAT_TYPE* y,
-                                  unsigned int s);
+FLOAT_TYPE* af_filter_pfir(unsigned int n, unsigned int k,
+                           unsigned int xi, const FLOAT_TYPE** w,
+                           const FLOAT_TYPE** x, FLOAT_TYPE* y,
+                           unsigned int s);
 
-//extern int af_filter_updateq(unsigned int n, unsigned int xi,
-//                             FLOAT_TYPE* xq, FLOAT_TYPE* in);
-extern int af_filter_updatepq(unsigned int n, unsigned int k, unsigned int xi,
-                              FLOAT_TYPE** xq, const FLOAT_TYPE* in, unsigned int s);
+//int af_filter_updateq(unsigned int n, unsigned int xi,
+//                      FLOAT_TYPE* xq, FLOAT_TYPE* in);
+int af_filter_updatepq(unsigned int n, unsigned int k, unsigned int xi,
+                       FLOAT_TYPE** xq, const FLOAT_TYPE* in, unsigned int s);
 
-extern int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, const FLOAT_TYPE* fc,
-                                unsigned int flags, FLOAT_TYPE opt);
+int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, const FLOAT_TYPE* fc,
+                         unsigned int flags, FLOAT_TYPE opt);
 
-extern int af_filter_design_pfir(unsigned int n, unsigned int k, const FLOAT_TYPE* w,
-                                 FLOAT_TYPE** pw, FLOAT_TYPE g,
-                                 unsigned int flags);
+int af_filter_design_pfir(unsigned int n, unsigned int k, const FLOAT_TYPE* w,
+                          FLOAT_TYPE** pw, FLOAT_TYPE g, unsigned int flags);
 
-extern int af_filter_szxform(const FLOAT_TYPE* a, const FLOAT_TYPE* b, FLOAT_TYPE Q,
-                             FLOAT_TYPE fc, FLOAT_TYPE fs, FLOAT_TYPE *k,
-                             FLOAT_TYPE *coef);
+int af_filter_szxform(const FLOAT_TYPE* a, const FLOAT_TYPE* b, FLOAT_TYPE Q,
+                      FLOAT_TYPE fc, FLOAT_TYPE fs, FLOAT_TYPE *k,
+                      FLOAT_TYPE *coef);
 
 /* Add new data to circular queue designed to be used with a FIR
    filter. xq is the circular queue, in pointing at the new sample, xi
diff --git a/libaf/window.h b/libaf/window.h
index 51afb349ac..fb4b1cefae 100644
--- a/libaf/window.h
+++ b/libaf/window.h
@@ -22,12 +22,12 @@
 #ifndef MPLAYER_WINDOW_H
 #define MPLAYER_WINDOW_H
 
-extern void af_window_boxcar(int n, FLOAT_TYPE* w);
-extern void af_window_triang(int n, FLOAT_TYPE* w);
-extern void af_window_hanning(int n, FLOAT_TYPE* w);
-extern void af_window_hamming(int n, FLOAT_TYPE* w);
-extern void af_window_blackman(int n, FLOAT_TYPE* w);
-extern void af_window_flattop(int n, FLOAT_TYPE* w);
-extern void af_window_kaiser(int n, FLOAT_TYPE* w, FLOAT_TYPE b);
+void af_window_boxcar(int n, FLOAT_TYPE* w);
+void af_window_triang(int n, FLOAT_TYPE* w);
+void af_window_hanning(int n, FLOAT_TYPE* w);
+void af_window_hamming(int n, FLOAT_TYPE* w);
+void af_window_blackman(int n, FLOAT_TYPE* w);
+void af_window_flattop(int n, FLOAT_TYPE* w);
+void af_window_kaiser(int n, FLOAT_TYPE* w, FLOAT_TYPE b);
 
 #endif /* MPLAYER_WINDOW_H */