Merge branch 'master' into epoxy

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 1f850519dec8af1f1032492d6ae4e601cfa542f9..4c3232b5f7dbca5a67f55a005775278c37d904d9 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -17,7 +17,7 @@
 // the EffectChain holds textures and other OpenGL objects that are tied to the
 // context.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <stdio.h>
 #include <map>
 #include <set>
@@ -26,6 +26,8 @@
 
 #include "image_format.h"
 
+namespace movit {
+
 class Effect;
 class Input;
 struct Phase;
@@ -266,4 +268,6 @@ private:
        bool owns_resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_EFFECT_CHAIN_H)