[MPlayer-cvslog] r30579 - in trunk: cfg-common.h gui/mplayer/mw.c libmpcodecs/vd.h mplayer.h

[diego]

Author: diego
Date: Sun Feb 14 15:47:22 2010
New Revision: 30579

Log:
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.

Modified:
   trunk/cfg-common.h
   trunk/gui/mplayer/mw.c
   trunk/libmpcodecs/vd.h
   trunk/mplayer.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Feb 14 15:33:16 2010	(r30578)
+++ trunk/cfg-common.h	Sun Feb 14 15:47:22 2010	(r30579)
@@ -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;
 

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Sun Feb 14 15:33:16 2010	(r30578)
+++ trunk/gui/mplayer/mw.c	Sun Feb 14 15:47:22 2010	(r30579)
@@ -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"

Modified: trunk/libmpcodecs/vd.h
==============================================================================
--- trunk/libmpcodecs/vd.h	Sun Feb 14 15:33:16 2010	(r30578)
+++ trunk/libmpcodecs/vd.h	Sun Feb 14 15:47:22 2010	(r30579)
@@ -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) */

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Sun Feb 14 15:33:16 2010	(r30578)
+++ trunk/mplayer.h	Sun Feb 14 15:47:22 2010	(r30579)
@@ -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;