Move http/ and rtsp/ into output/

2022-09-02 22:06:19 +02:00
parent 17ec167dd9
commit dd3aa47805
11 changed files with 36 additions and 24 deletions
--- a/cmd/camera-streamer/http.c
+++ b/cmd/camera-streamer/http.c
@ -3,7 +3,8 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/output.h"
+#include "output/rtsp/rtsp.h"

 extern unsigned char html_index_html[];
 extern unsigned int html_index_html_len;
--- a/cmd/camera-streamer/main.c
+++ b/cmd/camera-streamer/main.c
@ -3,7 +3,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/rtsp/rtsp.h"

 #include <signal.h>
 #include <unistd.h>
--- a/cmd/camera-streamer/opts.c
+++ b/cmd/camera-streamer/opts.c
@ -3,7 +3,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/rtsp/rtsp.h"

 camera_options_t camera_options = {
  .path = "",