diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 07:14:05 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 03:34:27 +0300 |
| commit | 1351b50ea5e12d0b316c0670a525f1a75be3100b (patch) | |
| tree | 9e791bd4718c3e38ba5844872f16fd15cb0f10bc /libmpcodecs/vd.c | |
| parent | 0dc3a72273127e28aec60b39373b48ad8da80c57 (diff) | |
| download | mpv-1351b50ea5e12d0b316c0670a525f1a75be3100b.tar.bz2 mpv-1351b50ea5e12d0b316c0670a525f1a75be3100b.tar.xz | |
Move flip and softzoom to options struct
Diffstat (limited to 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index c123423411..528b150c1a 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 softzoom=0; -int flip=-1; int opt_screen_size_x=0; int opt_screen_size_y=0; float screen_size_xy=0; @@ -232,14 +230,14 @@ csp_again: sh->vfilter=vf; // autodetect flipping - if(flip==-1){ - flip=0; + if(opts->flip==-1){ + opts->flip=0; if(sh->codec->outflags[j]&CODECS_FLAG_FLIP) if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP)) - flip=1; + opts->flip=1; } - if(vo_flags&VFCAP_FLIPPED) flip^=1; - if(flip && !(vo_flags&VFCAP_FLIP)){ + if(vo_flags&VFCAP_FLIPPED) opts->flip^=1; + if(opts->flip && !(vo_flags&VFCAP_FLIP)){ // we need to flip, but no flipping filter avail. vf_add_before_vo(&vf, "flip", NULL); sh->vfilter = vf; @@ -292,8 +290,8 @@ csp_again: vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN:0) | (opts->vidmode ? VOFLAG_MODESWITCHING:0) - | (softzoom ? VOFLAG_SWSCALE:0) - | (flip ? VOFLAG_FLIPPING:0); + | (opts->softzoom ? VOFLAG_SWSCALE:0) + | (opts->flip ? VOFLAG_FLIPPING:0); // Time to config libvo! mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |