Merge branch 'mjpeg'

[nageru] / nageru / decklink_capture.cpp

diff --git a/decklink_capture.cpp b/nageru/decklink_capture.cpp
similarity index 99%
rename from decklink_capture.cpp
rename to nageru/decklink_capture.cpp
index 0f48e3e77f48ffe18c74175675060b52ea02f50b..ea55b4668f3c83e4b5119c7ad63f91bf0d0ecaf9 100644 (file)
--- a/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -21,7 +21,7 @@
 #include "bmusb/bmusb.h"
 #include "decklink_util.h"
 #include "flags.h"
-#include "memcpy_interleaved.h"
+#include "shared/memcpy_interleaved.h"
 #include "v210_converter.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.