Merge branch 'mjpeg'

[nageru] / nageru / mixer.cpp

diff --git a/mixer.cpp b/nageru/mixer.cpp
similarity index 99%
rename from mixer.cpp
rename to nageru/mixer.cpp
index 294040f1bfd6fc6dde71a793af91c536e2c9f12e..953fd8133db59410ab2973d7592a05e5d133bc09 100644 (file)
--- a/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -37,20 +37,20 @@
 #include "cef_capture.h"
 #endif
 #include "chroma_subsampler.h"
-#include "context.h"
+#include "shared/context.h"
 #include "decklink_capture.h"
 #include "decklink_output.h"
 #include "defs.h"
-#include "disk_space_estimator.h"
+#include "shared/disk_space_estimator.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "input_mapping.h"
-#include "metrics.h"
+#include "shared/metrics.h"
 #include "mjpeg_encoder.h"
 #include "pbo_frame_allocator.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "resampling_queue.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "timecode_renderer.h"
 #include "v210_converter.h"
 #include "va_display_with_cleanup.h"