From b14909a955259c3b9c3494a5096ceed81397926c Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 24 Apr 2008 07:23:15 +0300 Subject: Move opt_screen_size_[x|y] to options struct --- libmpcodecs/vf_expand.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libmpcodecs/vf_expand.c') diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index 4b46f04e23..d775961eec 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -7,6 +7,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" +#include "options.h" #include "img_format.h" #include "mp_image.h" @@ -44,9 +45,6 @@ static struct vf_priv_s { 0 }; -extern int opt_screen_size_x; -extern int opt_screen_size_y; - //===========================================================================// #ifdef OSD_SUPPORT @@ -189,7 +187,9 @@ static void draw_osd(struct vf_instance* vf_,int w,int h){ static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ + unsigned int flags, unsigned int outfmt) +{ + struct MPOpts *opts = vf->opts; if(outfmt == IMGFMT_MPEGPES) { vf->priv->passthrough = 1; return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); @@ -225,7 +225,7 @@ static int config(struct vf_instance* vf, if(vf->priv->exp_y<0 || vf->priv->exp_y+height>vf->priv->exp_h) vf->priv->exp_y=(vf->priv->exp_h-height)/2; vf->priv->fb_ptr=NULL; - if(!opt_screen_size_x && !opt_screen_size_y){ + if(!opts->screen_size_x && !opts->screen_size_y){ d_width=d_width*vf->priv->exp_w/width; d_height=d_height*vf->priv->exp_h/height; } -- cgit v1.2.3