Declare externally used variables from vd.c as extern in vd.h.

This saves declaring them as extern all over the place.


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

6 files changed, 12 insertions, 16 deletions

diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index 33d9ec55f1..6c9593dd0a 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -38,8 +38,15 @@ typedef struct vd_functions_s
 // NULL terminated array of all drivers
 extern const vd_functions_t * const mpcodecs_vd_drivers[];
 
+extern int flip;
+extern int fullscreen;
+extern int opt_screen_size_x;
+extern int opt_screen_size_y;
+extern int softzoom;
 extern int vd_use_slices;
+extern int vidmode;
 extern float movie_aspect;
+extern float screen_size_xy;
 
 #define VDCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */
 #define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 894ebba6c2..f2d3ebac08 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -34,6 +34,7 @@
 
 #include "img_format.h"
 #include "mp_image.h"
+#include "vd.h"
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
@@ -67,9 +68,6 @@ static const struct vf_priv_s {
 	unsigned char* dirty_rows;
 } vf_priv_dflt;
 
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-
 extern ass_track_t* ass_track;
 extern float sub_delay;
 extern int sub_visibility;
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index 19935ce600..20b0228d82 100644
--- a/libmpcodecs/vf_crop.c
+++ b/libmpcodecs/vf_crop.c
@@ -26,6 +26,7 @@
 
 #include "img_format.h"
 #include "mp_image.h"
+#include "vd.h"
 #include "vf.h"
 
 #include "m_option.h"
@@ -39,9 +40,6 @@ static const struct vf_priv_s {
   -1,-1
 };
 
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-
 //===========================================================================//
 
 static int config(struct vf_instance *vf,
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 7232257394..963a2eb6a5 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -28,6 +28,7 @@
 
 #include "img_format.h"
 #include "mp_image.h"
+#include "vd.h"
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
@@ -70,9 +71,6 @@ static struct vf_priv_s {
   0
 };
 
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-
 //===========================================================================//
 #ifdef OSD_SUPPORT
 
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c
index 784cf56a29..1838a197ca 100644
--- a/libmpcodecs/vf_filmdint.c
+++ b/libmpcodecs/vf_filmdint.c
@@ -27,6 +27,7 @@
 
 #include "img_format.h"
 #include "mp_image.h"
+#include "vd.h"
 #include "vf.h"
 #include "cmmx.h"
 
@@ -97,9 +98,6 @@ struct vf_priv_s {
 static const struct frame_stats ppzs = {PPZ,PPZ,PPZ,PPZ,PPZ,PPZ,PPZ,0,0,9999};
 static const struct frame_stats pprs = {PPR,PPR,PPR,PPR,PPR,PPR,PPR,0,0,9999};
 
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-
 #ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
 #endif
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 523e9cb5a8..76c7634aa3 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -27,6 +27,7 @@
 
 #include "img_format.h"
 #include "mp_image.h"
+#include "vd.h"
 #include "vf.h"
 #include "fmt-conversion.h"
 #include "mpbswap.h"
@@ -58,10 +59,6 @@ static struct vf_priv_s {
   NULL
 };
 
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-extern float screen_size_xy;
-
 //===========================================================================//
 
 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam);