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

diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
index 8480da3f2e..3f3ad99d44 100644
--- a/libmpcodecs/ad_acm.c
+++ b/libmpcodecs/ad_acm.c
@@ -38,7 +38,7 @@ static int init(sh_audio_t *sh_audio)
   return 1;
 }
 
-extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
+void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 
 static int preinit(sh_audio_t *sh_audio)
 {
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index 51b260d061..64dc4bbf78 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -88,7 +88,7 @@ static int load_dll( char *libname )
      TvqGetNumFixedBitsPerFrame;
 }
 
-extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
+void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 static int init_vqf_audio_codec(sh_audio_t *sh_audio){
     WAVEFORMATEX *in_fmt=sh_audio->wf;
     vqf_priv_t*priv=sh_audio->context;
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h
index 0c65752202..c505a0539b 100644
--- a/libmpcodecs/dec_audio.h
+++ b/libmpcodecs/dec_audio.h
@@ -4,14 +4,14 @@
 #include "libmpdemux/stheader.h"
 
 // dec_audio.c:
-extern void afm_help(void);
-extern int init_best_audio_codec(sh_audio_t *sh_audio,char** audio_codec_list,char** audio_fm_list);
-extern int decode_audio(sh_audio_t *sh_audio, int minlen);
-extern void resync_audio_stream(sh_audio_t *sh_audio);
-extern void skip_audio_frame(sh_audio_t *sh_audio);
-extern void uninit_audio(sh_audio_t *sh_audio);
+void afm_help(void);
+int init_best_audio_codec(sh_audio_t *sh_audio, char** audio_codec_list, char** audio_fm_list);
+int decode_audio(sh_audio_t *sh_audio, int minlen);
+void resync_audio_stream(sh_audio_t *sh_audio);
+void skip_audio_frame(sh_audio_t *sh_audio);
+void uninit_audio(sh_audio_t *sh_audio);
 
-extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
-		int *out_samplerate, int *out_channels, int *out_format);
+int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
+                       int *out_samplerate, int *out_channels, int *out_format);
 
 #endif /* MPLAYER_DEC_AUDIO_H */
diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h
index 271d08850e..42aa56ecb5 100644
--- a/libmpcodecs/dec_video.h
+++ b/libmpcodecs/dec_video.h
@@ -6,23 +6,23 @@
 struct osd_state;
 
 // dec_video.c:
-extern void vfm_help(void);
+void vfm_help(void);
 
-extern int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,char** video_fm_list);
-extern void uninit_video(sh_video_t *sh_video);
+int init_best_video_codec(sh_video_t *sh_video, char** video_codec_list, char** video_fm_list);
+void uninit_video(sh_video_t *sh_video);
 
-extern void *decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts);
-extern int filter_video(sh_video_t *sh_video, void *frame, double pts,
-                        struct osd_state *osd);
+void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size, int drop_frame, double pts);
+int filter_video(sh_video_t *sh_video, void *frame, double pts,
+                 struct osd_state *osd);
 
-extern int get_video_quality_max(sh_video_t *sh_video);
-extern void set_video_quality(sh_video_t *sh_video,int quality);
+int get_video_quality_max(sh_video_t *sh_video);
+void set_video_quality(sh_video_t *sh_video, int quality);
 
-extern int get_video_colors(sh_video_t *sh_video,const char *item,int *value);
-extern int set_video_colors(sh_video_t *sh_video,const char *item,int value);
-extern int set_rectangle(sh_video_t *sh_video,int param,int value);
-extern void resync_video_stream(sh_video_t *sh_video);
-extern int get_current_video_decoder_lag(sh_video_t *sh_video);
+int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
+int set_video_colors(sh_video_t *sh_video, const char *item, int value);
+int set_rectangle(sh_video_t *sh_video, int param, int value);
+void resync_video_stream(sh_video_t *sh_video);
+int get_current_video_decoder_lag(sh_video_t *sh_video);
 
 extern int divx_quality;
 
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index e74007803e..afe17f7c6a 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -134,7 +134,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
     return CONTROL_UNKNOWN;
 }
 
-extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
+void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
 
 // init driver
 static int init(sh_video_t *sh){