# HG changeset patch
# User diego
# Date 1266158842 0
# Node ID 7bebe34b6ad2a08c798b78aaa3de1e51055e8525
# Parent  39a4dd7ec420281ddccf8505afdf7840e597ce78
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.

diff -r 39a4dd7ec420 -r 7bebe34b6ad2 cfg-common.h
--- 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;
 
diff -r 39a4dd7ec420 -r 7bebe34b6ad2 gui/mplayer/mw.c
--- 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"
diff -r 39a4dd7ec420 -r 7bebe34b6ad2 libmpcodecs/vd.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) */
diff -r 39a4dd7ec420 -r 7bebe34b6ad2 mplayer.h
--- 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;