Merge branch 'master' into epoxy

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 44587bf22f9200a1f79147c1ced2b9bf40e82dbb..f0112b3ca7c4abcec1ba73a6ce420f65b10162dd 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -15,7 +15,7 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
 #include <string>