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/vd.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/vd.c')
-rw-r--r-- | libmpcodecs/vd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 528b150c1a..b475f848e3 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -111,8 +111,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #include "libvo/video_out.h" // libvo opts: -int opt_screen_size_x=0; -int opt_screen_size_y=0; float screen_size_xy=0; float movie_aspect=-1.0; int vo_flags=0; @@ -249,9 +247,9 @@ csp_again: else if(sh->stream_aspect!=0.0) sh->aspect = sh->stream_aspect; // if(!sh->aspect) sh->aspect=1.0; - if(opt_screen_size_x||opt_screen_size_y){ - screen_size_x = opt_screen_size_x; - screen_size_y = opt_screen_size_y; + if(opts->screen_size_x||opts->screen_size_y){ + screen_size_x = opts->screen_size_x; + screen_size_y = opts->screen_size_y; if(!opts->vidmode){ if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; |