Fix some compilation errors with Movit from packages.

diff --git a/glwidget.cpp b/glwidget.cpp
index e09060f4949c12ab1258de5ac9616b3155dfa8d8..c57d645c61acd9ef1d288a058d6cfdda9f1dfa23 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -9,16 +9,16 @@
 #include <QAction>
 #include <QMenu>
 #include <QSurfaceFormat>
-#include <movit/resource_pool.h>
 
 #include "glwidget.h"
 
 #include <stdio.h>
 #include <functional>
 #include <mutex>
+#include <movit/effect_chain.h>
+#include <movit/resource_pool.h>
 
 #include "context.h"
-#include "effect_chain.h"
 #include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"

diff --git a/mixer.cpp b/mixer.cpp
index 70e4a9d0ea2170c665d1dcf594e33751a7105447..c92d9787099a6cee6ab4ef160271c80fe1aa4df2 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -4,11 +4,11 @@
 
 #include <assert.h>
 #include <epoxy/egl.h>
-#include <init.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
 #include <movit/flat_input.h>
 #include <movit/image_format.h>
+#include <movit/init.h>
 #include <movit/resource_pool.h>
 #include <movit/util.h>
 #include <stdint.h>

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 370fa3d1ea7e145ce1f0e5dee54a2e7610a0f040..8c92ec3ce29c42be7bf86a983a13f0db6221572d 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <cstddef>
 
-#include "util.h"
+#include <movit/util.h>
 
 using namespace std;