2.1.0: -Fixed ffmpeg input crash. -Log throwing call-stack.

[casparcg] / modules / ffmpeg / producer / ffmpeg_producer.cpp

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 75ab8c7dc8dbbf6733df8282778c77896ba5178d..3f770ae0660736a55806ab5f4dffb30a9c44531f 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -100,7 +100,7 @@ public:
                , frame_factory_(frame_factory)         \r
                , format_desc_(format_desc)\r
                , input_(graph_, filename_, loop, start, length)\r
-               , fps_(read_fps(*input_.context(), format_desc_.fps))\r
+               , fps_(read_fps(input_.context(), format_desc_.fps))\r
                , muxer_(fps_, frame_factory, format_desc_, filter)\r
                , start_(start)\r
                , last_frame_(core::draw_frame::empty())\r
@@ -267,7 +267,7 @@ public:
                        result = boost::lexical_cast<std::wstring>(start());\r
                }\r
                else\r
-                       BOOST_THROW_EXCEPTION(invalid_argument());\r
+                       CASPAR_THROW_EXCEPTION(invalid_argument());\r
 \r
                return async(launch::deferred, [=]{return result;});\r
        }\r