Fix some Futatabi shutdown problems.

[nageru] / futatabi / video_stream.cpp

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index c4cf52e0779a9093709174466afdf79bc8df5c74..6749f0d8df7887a0eeb9cc57b8c50fa0289d41a4 100644 (file)
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -269,6 +269,8 @@ void VideoStream::start()
 
 void VideoStream::stop()
 {
+       should_quit = true;
+       clear_queue();
        encode_thread.join();
 }
 
@@ -552,7 +554,7 @@ void VideoStream::encode_thread_func()
                exit(1);
        }
 
-       for ( ;; ) {
+       while (!should_quit) {
                QueuedFrame qf;
                {
                        unique_lock<mutex> lock(queue_lock);