Merge branch 'mjpeg'

[nageru] / nageru / mixer.h

diff --git a/mixer.h b/nageru/mixer.h
similarity index 99%
rename from mixer.h
rename to nageru/mixer.h
index 84313e5130b0816b2a997ee9265d637781cb3aed..b4ed76f4575ff0403b4865a470af8925d548ddd1 100644 (file)
--- a/mixer.h
+++ b/nageru/mixer.h
@@ -28,14 +28,14 @@
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "input_state.h"
 #include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "theme.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "video_encoder.h"
 #include "ycbcr_interpretation.h"