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

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 816f72d216662169ba79e688da6f1b054bb30613..b88aa56267e7b7e87f9747be3db8d96e25280e5a 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -5,7 +5,7 @@
 #include "defs.h"
 #include "shared/ffmpeg_raii.h"
 #include "frame_on_disk.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "jpeg_frame_view.h"
 #include "shared/mux.h"
 #include "shared/timebase.h"