Author: diego Date: Thu Jun 17 10:33:55 2010 New Revision: 31444 Log: Move force_monitor_aspect and monitor_pixel_aspect declarations to aspect.h. Modified: trunk/cfg-mplayer.h trunk/libvo/aspect.h Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Thu Jun 17 10:28:43 2010 (r31443) +++ trunk/cfg-mplayer.h Thu Jun 17 10:33:55 2010 (r31444) @@ -25,6 +25,7 @@ #include "cfg-common.h" #include "libmpcodecs/vd.h" +#include "libvo/aspect.h" #include "libvo/vo_zr.h" extern int key_fifo_size; @@ -55,10 +56,6 @@ extern char * skinName; extern int guiWinID; -/* from libvo/aspect.c */ -extern float force_monitor_aspect; -extern float monitor_pixel_aspect; - const m_option_t vd_conf[]={ {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} Modified: trunk/libvo/aspect.h ============================================================================== --- trunk/libvo/aspect.h Thu Jun 17 10:28:43 2010 (r31443) +++ trunk/libvo/aspect.h Thu Jun 17 10:33:55 2010 (r31444) @@ -24,6 +24,9 @@ extern int vo_panscan_x; extern int vo_panscan_y; extern float vo_panscan_amount; extern float monitor_aspect; +extern float force_monitor_aspect; +extern float monitor_pixel_aspect; + void panscan_init(void); void panscan_calc(void);