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_xv.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_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index d43244e85d..4180ac0fd0 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -198,7 +198,7 @@ static void resize(struct vo *vo) */ 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 vo_x11_state *x11 = vo->x11; XVisualInfo vinfo; @@ -262,8 +262,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, } vo_x11_create_vo_window(vo, &vinfo, vo->dx, vo->dy, vo->dwidth, - vo->dheight, flags, CopyFromParent, "xv", - title); + vo->dheight, flags, CopyFromParent, "xv"); XChangeWindowAttributes(x11->display, x11->window, xswamask, &xswa); #ifdef CONFIG_XF86VM |