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 0bc5093b41ffa41fb315b1eacdc21af46e886124..700092719b137187901583b1bb096a802a5ac00b 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -325,8 +325,15 @@ public:
 \r
        ~ffmpeg_consumer()\r
        {    \r
-               executor_.wait();\r
-               \r
+               try\r
+               {\r
+                       executor_.wait();\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
+\r
                LOG_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");\r
                \r
                audio_st_.reset();\r