diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 07:23:15 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 03:34:27 +0300 |
| commit | b14909a955259c3b9c3494a5096ceed81397926c (patch) | |
| tree | f40a07013cfadad52aca1847038370345582b062 /libmpcodecs/vf_filmdint.c | |
| parent | 1351b50ea5e12d0b316c0670a525f1a75be3100b (diff) | |
| download | mpv-b14909a955259c3b9c3494a5096ceed81397926c.tar.bz2 mpv-b14909a955259c3b9c3494a5096ceed81397926c.tar.xz | |
Move opt_screen_size_[x|y] to options struct
Diffstat (limited to 'libmpcodecs/vf_filmdint.c')
| -rw-r--r-- | libmpcodecs/vf_filmdint.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 0b98e22f15..f479569536 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -6,6 +6,7 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" +#include "options.h" #include "img_format.h" #include "mp_image.h" @@ -79,9 +80,6 @@ struct vf_priv_s { static const struct frame_stats ppzs = {PPZ,PPZ,PPZ,PPZ,PPZ,PPZ,PPZ,0,0,9999}; static const struct frame_stats pprs = {PPR,PPR,PPR,PPR,PPR,PPR,PPR,0,0,9999}; -extern int opt_screen_size_x; -extern int opt_screen_size_y; - #ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) #endif @@ -1337,6 +1335,7 @@ static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { + struct MPOpts *opts = vf->opts; unsigned long cxm = 0; unsigned long cym = 0; struct vf_priv_s *p = vf->priv; @@ -1371,7 +1370,7 @@ static int config(struct vf_instance* vf, if (p->crop_x + p->w > width ) p->crop_x = 0; if (p->crop_y + p->h > height) p->crop_y = 0; - if(!opt_screen_size_x && !opt_screen_size_y){ + if(!opts->screen_size_x && !opts->screen_size_y){ d_width = d_width * p->w/width; d_height = d_height * p->h/height; } |