diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
| commit | 5c6795a687cd9149e57985b632cf7a1c4a5c8310 (patch) | |
| tree | 60f61ddbcd8aa96f04b9851029923d81d0b0be89 /libvo/x11_common.c | |
| parent | 8a93561c8187058ae6278c9c6adb5ada7bedeff4 (diff) | |
| parent | d7a1d12f6147b53944a56117feae66d8e0e52fb1 (diff) | |
| download | mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.bz2 mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.xz | |
Merge svn changes up to r30494
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 85ba55cc3f..3f10b164ca 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1059,7 +1059,6 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, hint.width = width; hint.height = height; hint.flags = PPosition | PSize; XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint); - vo_x11_sizehint(vo, x, y, width, height, 0); if (!vo_border) vo_x11_decoration(vo, 0); // map window XMapWindow(mDisplay, x11->window); |