diff options
| author | wm4 <wm4@nowhere> | 2015-05-01 18:47:27 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-05-01 18:47:27 +0200 |
| commit | e185887ba0da9967337541ebd71e244fb2833c4f (patch) | |
| tree | f9b9a1f33fe0b0dbed56436d3ef946d389519c29 /video | |
| parent | 0a7abbda6b555fb7746f737b52d0f00fb3e614db (diff) | |
| download | mpv-e185887ba0da9967337541ebd71e244fb2833c4f.tar.bz2 mpv-e185887ba0da9967337541ebd71e244fb2833c4f.tar.xz | |
video/out: remove VOFLAG_FLIPPING
I think this used to be quite important, because the ancient VfW support
in MPlayer used to output flipped frames. This code has been dead in mpv
for quite some time (because VfW decoders were removed, and the --flip
option was dropped too), so get rid of it.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/vo.h | 1 | ||||
| -rw-r--r-- | video/out/vo_opengl.c | 7 | ||||
| -rw-r--r-- | video/out/vo_vdpau.c | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/video/out/vo.h b/video/out/vo.h index 36163acc92..26df7079d8 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -128,7 +128,6 @@ struct voctrl_get_equalizer_args { #define VO_NOTAVAIL -2 #define VO_NOTIMPL -3 -#define VOFLAG_FLIPPING 0x08 #define VOFLAG_HIDDEN 0x10 //< Use to create a hidden window #define VOFLAG_GL_DEBUG 0x40 // Hint to request debug OpenGL context #define VOFLAG_ALPHA 0x80 // Hint to request alpha framebuffer diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 15b36e8238..dda9f1ed7e 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -76,8 +76,6 @@ struct gl_priv { char *backend; - int vo_flipped; - bool frame_started; int frames_rendered; @@ -176,9 +174,6 @@ static void draw_image_timed(struct vo *vo, mp_image_t *mpi, struct gl_priv *p = vo->priv; GL *gl = p->gl; - if (p->vo_flipped) - mp_image_vflip(mpi); - mpgl_lock(p->glctx); if (mpi) @@ -242,8 +237,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) gl_video_config(p->renderer, params); - p->vo_flipped = !!(flags & VOFLAG_FLIPPING); - mpgl_unlock(p->glctx); return 0; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 098f449bcb..b92a7f2d3b 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -97,7 +97,6 @@ struct vdpctx { int flip_offset_window; int flip_offset_fs; int64_t flip_offset_us; - bool flip; VdpRect src_rect_vid; VdpRect out_rect_vid; @@ -237,8 +236,8 @@ static void resize(struct vo *vo) vc->out_rect_vid.y1 = dst_rect.y1; vc->src_rect_vid.x0 = src_rect.x0; vc->src_rect_vid.x1 = src_rect.x1; - vc->src_rect_vid.y0 = vc->flip ? src_rect.y1 : src_rect.y0; - vc->src_rect_vid.y1 = vc->flip ? src_rect.y0 : src_rect.y1; + vc->src_rect_vid.y0 = src_rect.y0; + vc->src_rect_vid.y1 = src_rect.y1; vc->flip_offset_us = vo->opts->fullscreen ? 1000LL * vc->flip_offset_fs : @@ -420,7 +419,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) if (!check_preemption(vo)) return -1; - vc->flip = flags & VOFLAG_FLIPPING; vc->image_format = params->imgfmt; vc->vid_width = params->w; vc->vid_height = params->h; |