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

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index e32bc00ee09e0133bfe951d5b533d6ef5f064696..fbfeb313194277bdf134986588bd00d703a52dd0 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -88,10 +88,9 @@ public:
 \r
        virtual void run()\r
        {\r
-               win32_exception::install_handler();\r
-\r
                try\r
                {\r
+                       win32_exception::install_handler();\r
                        while(true)\r
                        {               \r
                                auto ticket = governor_.acquire();\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index aaad94fa3370ba8c9c65dda2b9ce431b17168367..d42a0cd93eb0813a91188b43c1317e9958dc60f0 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -139,6 +139,8 @@ public:
                                                \r
        virtual safe_ptr<core::basic_frame> receive(int hints)\r
        {\r
+               win32_exception::install_handler();\r
+\r
                auto frame = core::basic_frame::late();\r
                \r
                try\r

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 483158e03142beace65a0cb9b48d1806b081354d..11f328458785887708661e3219cbb3f0060d9c24 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -151,10 +151,9 @@ struct frame_muxer2::implementation : public Concurrency::agent, boost::noncopya
                        \r
        virtual void run()\r
        {\r
-               win32_exception::install_handler();\r
-\r
                try\r
                {\r
+                       win32_exception::install_handler();\r
                        while(is_running_)\r
                        {       \r
                                auto ticket = governor_.acquire();\r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 412eb66d0578d483269c22e9e774be8069d2a991..710b9faa947a903a147cdc664e1dc49246425ab2 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -131,10 +131,9 @@ public:
        \r
        virtual void run()\r
        {\r
-               win32_exception::install_handler();\r
-\r
                try\r
                {\r
+                       win32_exception::install_handler();\r
                        for(auto packet = read_next_packet(); packet && is_running_; packet = read_next_packet())\r
                        {                               \r
                                Concurrency::asend(target_, make_safe_ptr(packet));\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 911963d9cee6d9942ae793212d59fd7802dda837..cc8a375fc18baadc18b12916197e6f8695d1b49c 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -114,10 +114,9 @@ public:
 \r
        virtual void run()\r
        {\r
-               win32_exception::install_handler();\r
-\r
                try\r
                {\r
+                       win32_exception::install_handler();\r
                        while(true)\r
                        {\r
                                auto ticket = governor_.acquire();\r