Fix a thread race that would sometimes cause x264 streaming to go awry.

[nageru] / x264_encoder.cpp

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 9874519362aadf8a3059eb77f2e797243d230459..f909f55e555bea9ee3369b62ad8509f207c324ee 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -1,14 +1,20 @@
+#include "x264_encoder.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <x264.h>
+#include <cstdint>
 
 #include "defs.h"
 #include "flags.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264_encoder.h"
 #include "x264_speed_control.h"
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 
@@ -188,6 +194,7 @@ void X264Encoder::encoder_thread_func()
                // No exit; it's not fatal.
        }
        init_x264();
+       x264_init_done = true;
 
        bool frames_left;