Get rid of pointless 'extern' keywords.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 33 insertions, 33 deletions

diff --git a/libvo/aspect.h b/libvo/aspect.h
index be5e4a12f8..952cd01466 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -6,8 +6,8 @@ extern int vo_panscan_x;
 extern int vo_panscan_y;
 extern float vo_panscan_amount;
 
-extern void panscan_init( void );
-extern void panscan_calc( void );
+void panscan_init(void);
+void panscan_calc(void);
 
 void aspect_save_orig(int orgw, int orgh);
 
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index 3ac32e3a71..be0b752558 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -28,8 +28,8 @@
 /*    || defined(HAVE_SSE) || defined(HAVE_SSE2) */
 #include <stddef.h>
 
-extern void * fast_memcpy(void * to, const void * from, size_t len);
-extern void * mem2agpcpy(void * to, const void * from, size_t len);
+void * fast_memcpy(void * to, const void * from, size_t len);
+void * mem2agpcpy(void * to, const void * from, size_t len);
 
 #else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */
 #define mem2agpcpy(a,b,c) memcpy(a,b,c)
diff --git a/libvo/osd.h b/libvo/osd.h
index c376d8d49c..897f79faa3 100644
--- a/libvo/osd.h
+++ b/libvo/osd.h
@@ -5,14 +5,14 @@
 // Generic alpha renderers for all YUV modes and RGB depths.
 // These are "reference implementations", should be optimized later (MMX, etc)
 
-extern void vo_draw_alpha_init(void); // build tables
+void vo_draw_alpha_init(void); // build tables
 
-extern void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_uyvy(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
+void vo_draw_alpha_yv12(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_yuy2(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_uyvy(int w,  int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_rgb24(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_rgb32(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_rgb15(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
+void vo_draw_alpha_rgb16(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
 
 #endif /* MPLAYER_OSD_H */
diff --git a/libvo/sub.c b/libvo/sub.c
index a1f4f3f2d3..4319f191a4 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -1030,7 +1030,7 @@ void *vo_vobsub=NULL;
 
 static int draw_alpha_init_flag=0;
 
-extern void vo_draw_alpha_init(void);
+void vo_draw_alpha_init(void);
 
        mp_osd_obj_t* vo_osd_list=NULL;
 
diff --git a/libvo/sub.h b/libvo/sub.h
index 67718c8938..591a166692 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -105,8 +105,8 @@ extern int spu_alignment;
 extern int spu_aamode;
 extern float spu_gaussvar;
 
-extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
-extern void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h));
+void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h));
 
 void vo_init_osd(void);
 int vo_update_osd(int dxs,int dys);
diff --git a/libvo/video_out.h b/libvo/video_out.h
index ec46e328c6..124a4a8476 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -244,9 +244,9 @@ typedef struct {
 	float max;
 	} range_t;
 
-extern float range_max(range_t *r);
-extern int in_range(range_t *r, float f);
-extern range_t *str2range(char *s);
+float range_max(range_t *r);
+int in_range(range_t *r, float f);
+range_t *str2range(char *s);
 extern char *monitor_hfreq_str;
 extern char *monitor_vfreq_str;
 extern char *monitor_dotclock_str;
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index c41d71959a..63b8c3ca70 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -89,7 +89,7 @@ static float window_aspect;
 static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO) = NULL;
 static RECT last_rect = {0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE};
 
-extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 extern int vidmode;
 
 /*****************************************************************************
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index 2d051e8a8f..3097651dfa 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -85,8 +85,8 @@ static vo_info_t info =
 
 LIBVO_EXTERN(macosx)
 
-extern void mplayer_put_key(int code);
-extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+void mplayer_put_key(int code);
+void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 
 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride)
 {
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 8fde1d0378..f6dfe0b212 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -128,7 +128,7 @@ enum
 
 #include "osdep/keycodes.h"
 
-extern void vo_draw_text(int dxs, int dys, void (*draw_alpha) (int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride));
+void vo_draw_text(int dxs, int dys, void (*draw_alpha) (int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride));
 
 //PROTOTYPE/////////////////////////////////////////////////////////////////
 static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index fc2884da5d..5c53b20c4c 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -54,7 +54,7 @@ static float window_aspect;
 static vidix_grkey_t gr_key;
     
 
-extern void set_video_eq( int cap );
+void set_video_eq(int cap);
 
 
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 9dc0e62f52..db09655259 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -68,7 +68,7 @@ static uint32_t window_width, window_height;
 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
     drwDepth, drwcX, drwcY, dwidth, dheight;
 
-extern void set_video_eq(int cap);
+void set_video_eq(int cap);
 
 
 static void set_window(int force_update)
diff --git a/libvo/w32_common.h b/libvo/w32_common.h
index 219e7d454d..41c0712470 100644
--- a/libvo/w32_common.h
+++ b/libvo/w32_common.h
@@ -7,14 +7,14 @@
 extern HWND vo_w32_window;
 extern int vo_vm;
 
-extern int vo_w32_init(void);
-extern void vo_w32_uninit(void);
-extern void vo_w32_ontop(void);
-extern void vo_w32_border(void);
-extern void vo_w32_fullscreen(void);
-extern int vo_w32_check_events(void);
-extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
-extern void destroyRenderingContext(void);
-extern void w32_update_xinerama_info(void);
+int vo_w32_init(void);
+void vo_w32_uninit(void);
+void vo_w32_ontop(void);
+void vo_w32_border(void);
+void vo_w32_fullscreen(void);
+int vo_w32_check_events(void);
+int vo_w32_config(uint32_t, uint32_t, uint32_t);
+void destroyRenderingContext(void);
+void w32_update_xinerama_info(void);
 
 #endif /* MPLAYER_W32_COMMON_H */