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/vo_gl2.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/vo_gl2.c')
| -rw-r--r-- | libvo/vo_gl2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index b2c7e49d25..d957337540 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -670,9 +670,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin if (initGl(vo_dwidth, vo_dheight) == -1) return -1; -#ifndef GL_WIN32 - if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop); -#endif return 0; } |