Merge branch 'master' into epoxy

[movit] / blur_effect.cpp

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 80aef747c8a6bba0da40f20b0a06e91b810e2937..b0327e2948307c0f5a92bd7de1dd537425fd93b5 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 #include <algorithm>
@@ -12,6 +12,8 @@
 #define NUM_TAPS 16
 
 using namespace std;
+
+namespace movit {
        
 BlurEffect::BlurEffect()
        : radius(3.0f),
@@ -196,3 +198,5 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const string &p
 void SingleBlurPassEffect::clear_gl_state()
 {
 }
+
+}  // namespace movit