# HG changeset patch # User diego # Date 1276762626 0 # Node ID 0f1be4f9f7ff7381c1639a9035648d74af165ea8 # Parent 64706b3742c111cdca02ca8f820e85d5c48481d8 Factorize monitor_aspect extern declaration into aspect.h. diff -r 64706b3742c1 -r 0f1be4f9f7ff libvo/aspect.h --- a/libvo/aspect.h Thu Jun 17 08:14:57 2010 +0000 +++ b/libvo/aspect.h Thu Jun 17 08:17:06 2010 +0000 @@ -23,6 +23,7 @@ extern int vo_panscan_x; extern int vo_panscan_y; extern float vo_panscan_amount; +extern float monitor_aspect; void panscan_init(void); void panscan_calc(void); diff -r 64706b3742c1 -r 0f1be4f9f7ff libvo/vo_dxr2.c --- a/libvo/vo_dxr2.c Thu Jun 17 08:14:57 2010 +0000 +++ b/libvo/vo_dxr2.c Thu Jun 17 08:17:06 2010 +0000 @@ -30,6 +30,7 @@ #include #include "config.h" +#include "aspect.h" #include "video_out.h" #include "video_out_internal.h" #include "mp_msg.h" @@ -43,8 +44,6 @@ #include -extern float monitor_aspect; - int dxr2_fd = -1; static int movie_w,movie_h; diff -r 64706b3742c1 -r 0f1be4f9f7ff libvo/vo_dxr3.c --- a/libvo/vo_dxr3.c Thu Jun 17 08:14:57 2010 +0000 +++ b/libvo/vo_dxr3.c Thu Jun 17 08:17:06 2010 +0000 @@ -322,7 +322,6 @@ { int tmp1, tmp2, size; em8300_register_t reg; - extern float monitor_aspect; /* Softzoom turned on, downscale */ /* This activates the subpicture processor, you can safely disable this and still send */