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_ass.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_ass.c')
| -rw-r--r-- | libmpcodecs/vf_ass.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 1790782111..e4a82741b9 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -29,6 +29,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" +#include "options.h" #include "img_format.h" #include "mp_image.h" @@ -66,9 +67,6 @@ static const struct vf_priv_s { unsigned char* dirty_rows; } vf_priv_dflt; -extern int opt_screen_size_x; -extern int opt_screen_size_y; - extern ass_track_t* ass_track; extern float sub_delay; extern int sub_visibility; @@ -77,12 +75,13 @@ 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; if (outfmt == IMGFMT_IF09) return 0; vf->priv->outh = height + ass_top_margin + ass_bottom_margin; vf->priv->outw = width; - if(!opt_screen_size_x && !opt_screen_size_y){ + if (!opts->screen_size_x && !opts->screen_size_y) { d_width = d_width * vf->priv->outw / width; d_height = d_height * vf->priv->outh / height; } |