Mercurial > mplayer.hg

changeset 30537:7bebe34b6ad2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author diego
date Sun, 14 Feb 2010 14:47:22 +0000
parents 39a4dd7ec420
children 571231765512
files cfg-common.h gui/mplayer/mw.c libmpcodecs/vd.h mplayer.h
diffstat 4 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Sun Feb 14 14:33:16 2010 +0000
+++ b/cfg-common.h	Sun Feb 14 14:47:22 2010 +0000
@@ -30,7 +30,6 @@
 
 // codec/filter opts: (defined at libmpcodecs/vd.c)
 extern float screen_size_xy;
-extern float movie_aspect;
 extern int softzoom;
 extern int flip;
 
--- a/gui/mplayer/mw.c	Sun Feb 14 14:33:16 2010 +0000
+++ b/gui/mplayer/mw.c	Sun Feb 14 14:47:22 2010 +0000
@@ -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"
--- a/libmpcodecs/vd.h	Sun Feb 14 14:33:16 2010 +0000
+++ b/libmpcodecs/vd.h	Sun Feb 14 14:47:22 2010 +0000
@@ -39,6 +39,7 @@
 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) */
--- a/mplayer.h	Sun Feb 14 14:33:16 2010 +0000
+++ b/mplayer.h	Sun Feb 14 14:47:22 2010 +0000
@@ -35,7 +35,6 @@
 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;