Fix an unneeded copy when muxing MJPEGs.

[nageru] / nageru / x264_encoder.cpp

diff --git a/nageru/x264_encoder.cpp b/nageru/x264_encoder.cpp
index 8463d1bae285744a420aa47a1155504eb3f07b00..b98d6fdac4de8749ebc65c5b57b35ced79980856 100644 (file)
--- a/nageru/x264_encoder.cpp
+++ b/nageru/x264_encoder.cpp
@@ -14,10 +14,10 @@
 
 #include "defs.h"
 #include "flags.h"
-#include "metrics.h"
-#include "mux.h"
+#include "shared/metrics.h"
+#include "shared/mux.h"
 #include "print_latency.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "x264_dynamic.h"
 #include "x264_speed_control.h"
 
@@ -112,7 +112,7 @@ void X264Encoder::add_frame(int64_t pts, int64_t duration, YCbCrLumaCoefficients
        {
                lock_guard<mutex> lock(mu);
                if (free_frames.empty()) {
-                       fprintf(stderr, "WARNING: x264 queue full, dropping frame with pts %ld\n", pts);
+                       fprintf(stderr, "WARNING: x264 queue full, dropping frame with pts %" PRId64 "\n", pts);
                        ++metric_x264_dropped_frames;
                        return;
                }