From 6725ce4d9eb5fd940e58f7453e6f2aecbbf7be58 Mon Sep 17 00:00:00 2001
From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 18 Apr 2012 19:29:39 +0000
Subject: [PATCH] git-svn-id:
 https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2912
 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

---
 modules/ffmpeg/consumer/ffmpeg_consumer.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 0bc5093b4..700092719 100644
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -325,8 +325,15 @@ public:
 
 	~ffmpeg_consumer()
 	{    
-		executor_.wait();
-		
+		try
+		{
+			executor_.wait();
+		}
+		catch(...)
+		{
+			CASPAR_LOG_CURRENT_EXCEPTION();
+		}
+
 		LOG_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");
 		
 		audio_st_.reset();
-- 
2.39.2