Combine the Nageru and Futatabi files that are identical.

[nageru] / futatabi / main.cpp

diff --git a/futatabi/main.cpp b/futatabi/main.cpp
index e0518afb95421d3ad906cc9a910f2dee01aef9d0..14bc12ac3a35edf87103449f67e3ab731cb92211 100644 (file)
--- a/futatabi/main.cpp
+++ b/futatabi/main.cpp
@@ -23,14 +23,14 @@ extern "C" {
 #include "context.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
-#include "ffmpeg_raii.h"
+#include "shared/ffmpeg_raii.h"
 #include "flags.h"
 #include "frame_on_disk.h"
 #include "frame.pb.h"
 #include "httpd.h"
 #include "mainwindow.h"
 #include "player.h"
-#include "post_to_main_thread.h"
+#include "shared/post_to_main_thread.h"
 #include "ref_counted_gl_sync.h"
 #include "timebase.h"
 #include "ui_mainwindow.h"