summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-30 00:14:20 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-30 00:14:20 +0200
commitdc7f1830224e1953fb07ffcc045735b2b15af310 (patch)
tree3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /libvo/gl_common.h
parent0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (diff)
parenta0601ed2566d132fec57dcf163372f9f341f3c13 (diff)
downloadmpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.bz2
mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.xz
Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
Diffstat (limited to 'libvo/gl_common.h')
-rw-r--r--libvo/gl_common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 654f13caf9..e556718ec0 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -69,6 +69,9 @@
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
+#ifndef GL_GENERATE_MIPMAP
+#define GL_GENERATE_MIPMAP 0x8191
+#endif
#ifndef GL_REGISTER_COMBINERS_NV
#define GL_REGISTER_COMBINERS_NV 0x8522
#endif