From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 2 Feb 2016 19:05:17 +0000 (+0100)
Subject: Fix some compilation errors with Movit from packages.
X-Git-Tag: 1.1.0~20
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=0fbc1a8e841b5e6d5c9c9df75eba711f92185f01;p=nageru

Fix some compilation errors with Movit from packages.
---

diff --git a/glwidget.cpp b/glwidget.cpp
index e09060f..c57d645 100644
--- 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 70e4a9d..c92d978 100644
--- 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 370fa3d..8c92ec3 100644
--- 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;