diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 07:01:53 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 03:34:27 +0300 |
| commit | 0dc3a72273127e28aec60b39373b48ad8da80c57 (patch) | |
| tree | 58aaa964583452f8e0258808785ae589972ae9f0 /libmpcodecs/vd.c | |
| parent | 41d6879236d2792300c57fc9825878ba4f634edd (diff) | |
| download | mpv-0dc3a72273127e28aec60b39373b48ad8da80c57.tar.bz2 mpv-0dc3a72273127e28aec60b39373b48ad8da80c57.tar.xz | |
Move vidmode to options struct
Diffstat (limited to 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 4362b2360a..c123423411 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -111,7 +111,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #include "libvo/video_out.h" // libvo opts: -int vidmode=0; int softzoom=0; int flip=-1; int opt_screen_size_x=0; @@ -255,7 +254,7 @@ csp_again: if(opt_screen_size_x||opt_screen_size_y){ screen_size_x = opt_screen_size_x; screen_size_y = opt_screen_size_y; - if(!vidmode){ + if(!opts->vidmode){ if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; if(screen_size_x<=8) screen_size_x*=sh->disp_w; @@ -292,7 +291,7 @@ csp_again: } vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN:0) - | (vidmode ? VOFLAG_MODESWITCHING:0) + | (opts->vidmode ? VOFLAG_MODESWITCHING:0) | (softzoom ? VOFLAG_SWSCALE:0) | (flip ? VOFLAG_FLIPPING:0); |