diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
commit | 53eeb0e41238699fb11701c357941f904338bb25 (patch) | |
tree | 965f3585bc690f9b5f654f1022a4c02709911706 /libvo | |
parent | b309b60a0c7230fae29475e8924ff51f107c2563 (diff) | |
parent | 96daf7ed5ef96b86f2539164c27155bc830aa2a6 (diff) | |
download | mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.bz2 mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.xz |
Merge branch 'ordered_chapters'
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_gl.c | 1 | ||||
-rw-r--r-- | libvo/vo_gl2.c | 2 | ||||
-rw-r--r-- | libvo/vo_vdpau.c | 1 | ||||
-rw-r--r-- | libvo/vo_x11.c | 1 | ||||
-rw-r--r-- | libvo/vo_xv.c | 1 | ||||
-rw-r--r-- | libvo/x11_common.c | 6 |
6 files changed, 5 insertions, 7 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 93064cfe5e..79353b5c36 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -538,7 +538,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin image_format = format; glFindFormat(format, NULL, &gl_texfmt, &gl_format, &gl_type); - int_pause = 0; vo_flipped = !!(flags & VOFLAG_FLIPPING); #ifdef CONFIG_GUI diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 382994e318..c545165b29 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -622,8 +622,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin image_width = width; image_format = format; - int_pause = 0; - #ifdef CONFIG_GUI if (use_gui) { if (config_glx_gui(d_width, d_height) == -1) diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 5d38306efb..2d3b269383 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -553,7 +553,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if (IMGFMT_IS_VDPAU(image_format) && !create_vdp_decoder(2)) return -1; - int_pause = 0; visible_buf = 0; #ifdef CONFIG_GUI diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 91d4d96269..3e5f15be7a 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -330,7 +330,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, old_vo_dwidth = -1; old_vo_dheight = -1; - int_pause = 0; if (!title) title = "MPlayer X11 (XImage/Shm) render"; diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 86257a1179..c9ce994235 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -223,7 +223,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, return -1; } - ctx->is_paused = 0; ctx->visible_buf = -1; ctx->have_visible_image_copy = false; ctx->have_next_image_copy = false; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index b70c0b8dd6..434cdbd04c 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -933,7 +933,11 @@ static void vo_x11_nofs_sizepos(struct vo *vo, int x, int y, { vo->dwidth = width; vo->dheight = height; - XMoveResizeWindow(vo->x11->display, vo->x11->window, x, y, width, height); + if (vo->opts->force_window_position) + XMoveResizeWindow(vo->x11->display, vo->x11->window, x, y, width, + height); + else + XResizeWindow(vo->x11->display, vo->x11->window, width, height); } } |