Fix a hang on exit when doing MJPEG encoding with VA-API.

[nageru] / nageru / decklink_output.cpp

diff --git a/nageru/decklink_output.cpp b/nageru/decklink_output.cpp
index 28f433a8872945b3191608cc7283eea5fea4669e..ed66212a26bf0ddfa0ab0cfac4214f6b7430d7e8 100644 (file)
--- a/nageru/decklink_output.cpp
+++ b/nageru/decklink_output.cpp
@@ -12,9 +12,9 @@
 #include "decklink_output.h"
 #include "decklink_util.h"
 #include "flags.h"
-#include "metrics.h"
+#include "shared/metrics.h"
 #include "print_latency.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "v210_converter.h"
 
 using namespace movit;
@@ -317,7 +317,7 @@ void DeckLinkOutput::send_frame(GLuint y_tex, GLuint cbcr_tex, YCbCrLumaCoeffici
        frame->duration = duration;
 
        {
-               unique_lock<mutex> lock(frame_queue_mutex);
+               lock_guard<mutex> lock(frame_queue_mutex);
                pending_video_frames.push(move(frame));
        }
        frame_queues_changed.notify_all();