Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / futatabi / video_stream.cpp

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index 52612e2f53996756a3c2d67f8fccf9cc13a3b3cc..8738dc546fa85ab09742aaf882454c0389cef402 100644 (file)
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -9,7 +9,7 @@ extern "C" {
 #include "shared/context.h"
 #include "flags.h"
 #include "flow.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "jpeg_frame_view.h"
 #include "movit/util.h"
 #include "shared/mux.h"