Mercurial > mplayer.hg
changeset 31378:23e5b1a28984
Move force_monitor_aspect and monitor_pixel_aspect declarations to aspect.h.
| author | diego |
|---|---|
| date | Thu, 17 Jun 2010 08:33:55 +0000 |
| parents | 1d38e2c9c005 |
| children | 82fce4fb5049 |
| files | cfg-mplayer.h libvo/aspect.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Thu Jun 17 08:28:43 2010 +0000 +++ b/cfg-mplayer.h Thu Jun 17 08:33:55 2010 +0000 @@ -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 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}
--- a/libvo/aspect.h Thu Jun 17 08:28:43 2010 +0000 +++ b/libvo/aspect.h Thu Jun 17 08:33:55 2010 +0000 @@ -24,6 +24,9 @@ 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);