Merge branch 'master' into epoxy

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 74585d6d94dae0d3be0ed5fc1da119e8cfc1fc91..24e637260ea97489d54080bef521572bc68d8b05 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -15,13 +15,15 @@
 // 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>
 
 #include "effect.h"
 
+namespace movit {
+
 class EffectChain;
 class Node;
 class SingleResamplePassEffect;
@@ -99,4 +101,6 @@ private:
        float slice_height;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)