diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 08:16:11 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 07:15:07 +0300 |
| commit | bb679dd40a80e72272dec0c8621b888f4365852c (patch) | |
| tree | 61673a17f7a3296e179da6fbda6c11b82c1596e1 /libmpcodecs/vd.c | |
| parent | 60f104d4aaf9f1f990045ca255c343e77ed3078c (diff) | |
| download | mpv-bb679dd40a80e72272dec0c8621b888f4365852c.tar.bz2 mpv-bb679dd40a80e72272dec0c8621b888f4365852c.tar.xz | |
Remove global vo_flags
Move the information to struct sh_video field.
Diffstat (limited to 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 1ff8b11522..623be9b2e8 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -104,7 +104,6 @@ vd_functions_t *mpcodecs_vd_drivers[] = { #include "libvo/video_out.h" // libvo opts: -int vo_flags = 0; int vd_use_slices = 1; /** global variables for gamma, brightness, contrast, saturation and hue @@ -178,7 +177,7 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, continue; } j = i; - vo_flags = flags; + sh->output_flags = flags; if (flags & VFCAP_CSP_SUPPORTED_BY_HW) break; } else if (!palette @@ -242,9 +241,9 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, if (!(sh->codec->outflags[j] & CODECS_FLAG_NOFLIP)) opts->flip = 1; } - if (vo_flags & VFCAP_FLIPPED) + if (sh->output_flags & VFCAP_FLIPPED) opts->flip ^= 1; - if (opts->flip && !(vo_flags & VFCAP_FLIP)) { + if (opts->flip && !(sh->output_flags & VFCAP_FLIP)) { // we need to flip, but no flipping filter avail. vf_add_before_vo(&vf, "flip", NULL); sh->vfilter = vf; |