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

1 files changed, 13 insertions, 13 deletions

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;