diff options
Diffstat (limited to 'libmpcodecs/vf_scale.c')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 38e75d8843..fe8632b2ec 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.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" @@ -41,8 +42,6 @@ static struct vf_priv_s { NULL }; -extern int opt_screen_size_x; -extern int opt_screen_size_y; extern float screen_size_xy; //===========================================================================// @@ -112,6 +111,7 @@ static unsigned int find_best_out(vf_instance_t *vf){ 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 int best=find_best_out(vf); int vo_flags; int int_sws_flags=0; @@ -296,7 +296,8 @@ static int config(struct vf_instance* vf, break; } } - if(!opt_screen_size_x && !opt_screen_size_y && !(screen_size_xy >= 0.001)){ + if (!opts->screen_size_x && !opts->screen_size_y + && !(screen_size_xy >= 0.001)) { // Compute new d_width and d_height, preserving aspect // while ensuring that both are >= output size in pixels. if (vf->priv->h * d_width > vf->priv->w * d_height) { |