Tighten up the Movit #include paths a bit; fixes compilation error in some cases.

diff --git a/decklink_output.cpp b/decklink_output.cpp
index 6295f7623c770b29325ab40a57e7cf72fc2968a1..17cc520d25964fca766d511fd653ef8c2e68b2d1 100644 (file)
--- a/decklink_output.cpp
+++ b/decklink_output.cpp
@@ -10,7 +10,6 @@
 #include "decklink_util.h"
 #include "flags.h"
 #include "print_latency.h"
-#include "resource_pool.h"
 #include "timebase.h"
 #include "v210_converter.h"
 

diff --git a/image_input.cpp b/image_input.cpp
index f6805d3ca86954d3b31cfc863240792b8544cfbe..2bf4a237bb86758f92cbdcfba808c514c7c19b82 100644 (file)
--- a/image_input.cpp
+++ b/image_input.cpp
@@ -1,6 +1,7 @@
 #include "image_input.h"
 
 #include <errno.h>
+#include <movit/flat_input.h>
 #include <movit/image_format.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -32,7 +33,6 @@ extern "C" {
 #include "ffmpeg_raii.h"
 #include "ffmpeg_util.h"
 #include "flags.h"
-#include "flat_input.h"
 
 struct SwsContext;
 

diff --git a/theme.cpp b/theme.cpp
index 048abddcff168843f4cd9ab8fde751df1e896101..22c940aeb594fced3e409862b3e020df24648a0b 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -5,9 +5,11 @@
 #include <epoxy/gl.h>
 #include <lauxlib.h>
 #include <lua.hpp>
+#include <movit/deinterlace_effect.h>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
+#include <movit/input.h>
 #include <movit/mix_effect.h>
 #include <movit/multiply_effect.h>
 #include <movit/overlay_effect.h>
@@ -26,11 +28,9 @@
 #include <utility>
 
 #include "defs.h"
-#include "deinterlace_effect.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "image_input.h"
-#include "input.h"
 #include "input_state.h"
 #include "pbo_frame_allocator.h"