Merge branch 'mjpeg'

[nageru] / nageru / mjpeg_encoder.cpp

diff --git a/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
similarity index 99%
rename from mjpeg_encoder.cpp
rename to nageru/mjpeg_encoder.cpp
index 740b059211c6b2b097497d82ffe003fd5cdbd658..3587d78dcf3fa51a61a92af89ec362b3297b2d3e 100644 (file)
--- a/mjpeg_encoder.cpp
+++ b/nageru/mjpeg_encoder.cpp
@@ -12,12 +12,12 @@ extern "C" {
 }
 
 #include "defs.h"
-#include "ffmpeg_raii.h"
+#include "shared/ffmpeg_raii.h"
 #include "flags.h"
-#include "httpd.h"
-#include "memcpy_interleaved.h"
+#include "shared/httpd.h"
+#include "shared/memcpy_interleaved.h"
 #include "pbo_frame_allocator.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "va_display_with_cleanup.h"
 
 #include <va/va.h>