diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:44:28 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:44:28 +0200 |
| commit | bc0f5249090cec1c460a910c2f46d2c760a2a3fe (patch) | |
| tree | 91ea711bd517d7ebd21f96dc1e9e64da3e7953ac /libvo | |
| parent | a1b84c208002a293e663673af26ccaf639ae726f (diff) | |
| parent | bc802c1e3efbe92cf653c415db5143291f096af4 (diff) | |
| download | mpv-bc0f5249090cec1c460a910c2f46d2c760a2a3fe.tar.bz2 mpv-bc0f5249090cec1c460a910c2f46d2c760a2a3fe.tar.xz | |
Merge svn changes up to r30502
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/swscale.c
libvo/x11_common.c
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/x11_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 3f10b164ca..f16c203a38 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1062,7 +1062,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, if (!vo_border) vo_x11_decoration(vo, 0); // map window XMapWindow(mDisplay, x11->window); - XClearWindow(mDisplay, x11->window); + vo_x11_clearwindow(vo, x11->window); // wait for map do { XNextEvent(mDisplay, &xev); |