git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index a15089238c0be7bf3357cf445a4a5c7c31352874..2f4870b79768ab1a2eff40fba7c911bb9dedbd1c 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -138,9 +138,11 @@ public:
 \r
        ~ffmpeg_consumer()\r
        {    \r
+               executor_.wait();\r
                executor_.stop();\r
                executor_.join();\r
 \r
+               file_write_executor_.wait();\r
                file_write_executor_.stop();\r
                file_write_executor_.join();\r
                \r