diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:14:16 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:50:58 +0300 |
| commit | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (patch) | |
| tree | 1ba215c9978eadcd6b99b2c696b22ea6a3779e33 /libvo/gl_common.h | |
| parent | 577587ec6ce8dad59c303a76cba03af03db879a3 (diff) | |
| parent | 901574e3bf6ff45a46a12dc7884a93970f9d58d1 (diff) | |
| download | mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.bz2 mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.xz | |
Merge svn changes up to r27347
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index a7a4f8c2b1..8b1e4b144c 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -293,6 +293,7 @@ void glDisableYUVConversion(GLenum target, int type); /** \} */ #ifdef GL_WIN32 +#define vo_gl_border(vo) vo_w32_border() #define vo_check_events() vo_w32_check_events() #define vo_fullscreen() vo_w32_fullscreen() #define vo_gl_ontop() vo_w32_ontop() @@ -300,6 +301,7 @@ void glDisableYUVConversion(GLenum target, int type); int setGlWindow(int *vinfo, HGLRC *context, HWND win); void releaseGlContext(int *vinfo, HGLRC *context); #else +#define vo_gl_border(vo) vo_x11_border(vo) #define vo_check_events() vo_x11_check_events(mDisplay) #define vo_fullscreen() vo_x11_fullscreen() #define vo_gl_ontop() vo_x11_ontop() |