diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
| commit | 1715c2a33632b333f8e8e581ef23ea5fe0234edd (patch) | |
| tree | f2f9ddca0f4940edd845d71a5bfd74c8a09ba633 /libvo/gl_common.c | |
| parent | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (diff) | |
| parent | 409bb1c5daba69aac788ce5065d05b8ea8441cfd (diff) | |
| download | mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.bz2 mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.xz | |
Merge svn changes up to r27949
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
Diffstat (limited to 'libvo/gl_common.c')
| -rw-r--r-- | libvo/gl_common.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 65592932e6..cd75bdb706 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1608,13 +1608,7 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win) // set new values vo_window = win; - { - Window root; - int tmp; - unsigned utmp; - XGetGeometry(mDisplay, vo_window, &root, &tmp, &tmp, - (unsigned *)&vo_dwidth, (unsigned *)&vo_dheight, &utmp, &utmp); - } + vo_x11_update_geometry(); if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); |