diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-07 00:13:51 +0200 |
commit | fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f (patch) | |
tree | c78705f95df4143bc28d19db6ad36df2ab2cf215 /libvo/vo_gl.c | |
parent | 92e5414897707d998b4ba46664709347760f5b11 (diff) | |
parent | 82118dc35edfbf9b6714e1e4e6b1823fc3205ff7 (diff) | |
download | mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.bz2 mpv-fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f.tar.xz |
Merge remote-tracking branch 'wm4/window_title'
Diffstat (limited to 'libvo/vo_gl.c')
-rw-r--r-- | libvo/vo_gl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 08868246e5..e68465f009 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -643,19 +643,19 @@ static int initGl(struct vo *vo, uint32_t d_width, uint32_t d_height) } static int create_window(struct vo *vo, uint32_t d_width, uint32_t d_height, - uint32_t flags, const char *title) + uint32_t flags) { struct gl_priv *p = vo->priv; if (p->stereo_mode == GL_3D_QUADBUFFER) flags |= VOFLAG_STEREO; - return p->glctx->create_window(p->glctx, d_width, d_height, flags, title); + return p->glctx->create_window(p->glctx, d_width, d_height, flags); } static int config(struct vo *vo, uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, - char *title, uint32_t format) + uint32_t format) { struct gl_priv *p = vo->priv; @@ -672,7 +672,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, p->vo_flipped = !!(flags & VOFLAG_FLIPPING); - if (create_window(vo, d_width, d_height, flags, title) < 0) + if (create_window(vo, d_width, d_height, flags) < 0) return -1; if (vo->config_count) @@ -1371,7 +1371,7 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw, } if (p->use_yuv == -1 || !allow_sw) { - if (create_window(vo, 320, 200, VOFLAG_HIDDEN, NULL) < 0) + if (create_window(vo, 320, 200, VOFLAG_HIDDEN) < 0) goto err_out; if (p->glctx->setGlWindow(p->glctx) == SET_WINDOW_FAILED) goto err_out; |