diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 14:47:22 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-14 14:47:22 +0000 |
commit | 2e98215f1360e24a16120b6fcdd78724ce54028b (patch) | |
tree | 755b6172bb6b7630ae739a0e68cf5e36fcbc57ba | |
parent | 6448809568dba98177ec36ddc9df347073a65402 (diff) |
Move movie_aspect extern declaration to libmpcodecs/vd.h.
This is the appropriate place for the declaration; the variable is
declared in libmpcodecs/vd.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30579 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-common.h | 1 | ||||
-rw-r--r-- | gui/mplayer/mw.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vd.h | 1 | ||||
-rw-r--r-- | mplayer.h | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index db167d2f27..04058e9480 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -30,7 +30,6 @@ extern int mp_msg_module; // codec/filter opts: (defined at libmpcodecs/vd.c) extern float screen_size_xy; -extern float movie_aspect; extern int softzoom; extern int flip; diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c index 1445afe379..a2b5266bb5 100644 --- a/gui/mplayer/mw.c +++ b/gui/mplayer/mw.c @@ -42,6 +42,7 @@ #include "libvo/sub.h" #include "access_mpcontext.h" +#include "libmpcodecs/vd.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" #include "codec-cfg.h" diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h index 65c24f9714..33d9ec55f1 100644 --- a/libmpcodecs/vd.h +++ b/libmpcodecs/vd.h @@ -39,6 +39,7 @@ typedef struct vd_functions_s extern const vd_functions_t * const mpcodecs_vd_drivers[]; extern int vd_use_slices; +extern float movie_aspect; #define VDCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */ #define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */ @@ -35,7 +35,6 @@ extern unsigned int osd_visible; extern char * font_name; extern char * sub_font_name; extern float font_factor; -extern float movie_aspect; extern double force_fps; //extern char **sub_name; |