# HG changeset patch
# User reimar
# Date 1124587231 0
# Node ID 7f34acc96aa4051f73b86dd483218877244663a1
# Parent  f63467892e43dd65b38031f76a05aeee945e73b4
remove extern for variables that are already in headers.

diff -r f63467892e43 -r 7f34acc96aa4 libvo/video_out.h
--- a/libvo/video_out.h	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/video_out.h	Sun Aug 21 01:20:31 2005 +0000
@@ -201,6 +201,7 @@
 extern int vo_refresh_rate;
 extern int vo_keepaspect;
 extern int vo_rootwin;
+extern int vo_ontop;
 
 extern int vo_gamma_brightness;
 extern int vo_gamma_saturation;
@@ -220,6 +221,8 @@
 
 extern int vo_colorkey;
 
+extern int WinID;
+
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
 
 typedef struct {
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_directx.c
--- a/libvo/vo_directx.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_directx.c	Sun Aug 21 01:20:31 2005 +0000
@@ -81,14 +81,7 @@
 
 extern void mplayer_put_key(int code);              //let mplayer handel the keyevents 
 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 int vo_doublebuffering;                      //tribblebuffering    
-extern int vo_fs;
-extern int vo_directrendering;
-extern int vo_ontop;
-extern int vo_rootwin;
 extern int vidmode;
-extern int vo_colorkey;
-extern int WinID;
 
 /*****************************************************************************
  * DirectDraw GUIDs.
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_ggi.c
--- a/libvo/vo_ggi.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_ggi.c	Sun Aug 21 01:20:31 2005 +0000
@@ -39,10 +39,6 @@
 #include <ggi/wmh.h>
 #endif
 
-#ifdef HAVE_GGIWMH
-extern int vo_ontop;	/* Window on top */
-#endif
-
 /* maximum buffers */
 #undef GGI_FLIP
 
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_gif89a.c
--- a/libvo/vo_gif89a.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_gif89a.c	Sun Aug 21 01:20:31 2005 +0000
@@ -69,7 +69,6 @@
 LIBVO_EXTERN(gif89a)
 
 extern int verbose;
-extern int vo_config_count;
 
 
 // how many frames per second we are aiming for during output.
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_quartz.c
--- a/libvo/vo_quartz.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_quartz.c	Sun Aug 21 01:20:31 2005 +0000
@@ -67,15 +67,10 @@
 static int EnterMoviesDone = 0;
 static int get_image_done = 0;
 
-extern int vo_rootwin;
-extern int vo_ontop;
-extern int vo_fs; // user want fullscreen
 static int vo_quartz_fs; // we are in fullscreen
 extern float monitor_aspect;
-extern int vo_keepaspect; //keep aspect ratio when resizing
 extern float movie_aspect;
 static float old_movie_aspect;
-extern float vo_panscan;
 
 static int winLevel = 1;
 int levelList[] =
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_svga.c
--- a/libvo/vo_svga.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_svga.c	Sun Aug 21 01:20:31 2005 +0000
@@ -52,9 +52,6 @@
 //silence warnings, probably it have to go in some global header
 #define UNUSED(x) ((void)(x)) 
 
-extern int vo_doublebuffering;
-extern int vo_directrendering;
-extern int vo_dbpp;
 extern int verbose;
 
 static int query_format(uint32_t format);
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_winvidix.c
--- a/libvo/vo_winvidix.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_winvidix.c	Sun Aug 21 01:20:31 2005 +0000
@@ -56,7 +56,6 @@
     
 
 extern void set_video_eq( int cap );
-extern int vo_config_count;
 
 
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
diff -r f63467892e43 -r 7f34acc96aa4 libvo/vo_xvmc.c
--- a/libvo/vo_xvmc.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/vo_xvmc.c	Sun Aug 21 01:20:31 2005 +0000
@@ -46,7 +46,6 @@
 #define UNUSED(x) ((void)(x))
 
 
-extern int vo_directrendering;
 extern int vo_verbose;
 
 static int benchmark;
diff -r f63467892e43 -r 7f34acc96aa4 libvo/x11_common.c
--- a/libvo/x11_common.c	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/x11_common.c	Sun Aug 21 01:20:31 2005 +0000
@@ -80,7 +80,6 @@
 int mLocalDisplay;
 
 /* output window id */
-extern int WinID;
 int vo_mouse_autohide = 0;
 int vo_wm_type = 0;
 int vo_fs_type = 0; // needs to be accessible for GUI X11 code
@@ -866,10 +865,6 @@
     long state;
 } MotifWmHints;
 
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-
 static MotifWmHints vo_MotifWmHints;
 static Atom vo_MotifHints = None;
 
diff -r f63467892e43 -r 7f34acc96aa4 libvo/x11_common.h
--- a/libvo/x11_common.h	Sun Aug 21 00:17:15 2005 +0000
+++ b/libvo/x11_common.h	Sun Aug 21 01:20:31 2005 +0000
@@ -21,27 +21,17 @@
 #define _NET_WM_STATE_TOGGLE        2    /* toggle property  */
 
 extern int metacity_hack;
-extern int vo_fsmode;
 
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-extern int vo_dwidth;
-extern int vo_dheight;
-extern int vo_fs;
 extern int vo_fs_layer;
 extern int vo_wm_type;
 extern int vo_fs_type;
 extern char** vo_fstype_list;
-extern int vo_ontop;
-extern int vo_rootwin;
 
 extern char *mDisplayName;
 extern Display *mDisplay;
 extern Window mRootWin;
 extern int mScreen;
 extern int mLocalDisplay;
-extern int WinID;
 
 extern int vo_mouse_timer_const;
 extern int vo_mouse_autohide;