diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
| commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
| tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /libvo/gl_common.h | |
| parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
| parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
| download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz | |
Merge svn changes up to r31097
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 5cf4d2859e..534bc908c1 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -41,6 +41,9 @@ // This old-vo wrapper macro would conflict with the struct member #undef update_xinerama_info #endif +#ifdef CONFIG_GL_SDL +#include <GL/gl.h> +#endif // workaround for some gl.h headers #ifndef GLAPIENTRY @@ -372,8 +375,10 @@ void glDisableYUVConversion(GLenum target, int type); /** \} */ enum MPGLType { + GLTYPE_AUTO, GLTYPE_W32, GLTYPE_X11, + GLTYPE_SDL, }; typedef struct MPGLContext { |