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

[casparcg] / modules / decklink / util / util.h

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 5e79e8dcc576380e98f6b2d2fc0158ab1a610529..a7828f52d4b549ee5cccc0fb8132b16eeef5d3af 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -95,14 +95,14 @@ BMDDisplayMode get_display_mode(const T& device, BMDDisplayMode format, BMDPixel
        }\r
 \r
        if(!mode)\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Device could not find requested video-format.") \r
+               CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Device could not find requested video-format.") \r
                                                                                                 << arg_value_info(boost::lexical_cast<std::string>(format))\r
                                                                                                 << arg_name_info("format"));\r
                \r
        BMDDisplayModeSupport displayModeSupport;\r
        if(FAILED(device->DoesSupportVideoMode(mode->GetDisplayMode(), pix_fmt, flag, &displayModeSupport, nullptr)) || displayModeSupport == bmdDisplayModeNotSupported)\r
                CASPAR_LOG(warning) << L"Device does not support video-format: " << mode->GetDisplayMode();\r
-               //BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Device does not support requested video-format.")\r
+               //CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Device does not support requested video-format.")\r
                //                                                                               << arg_value_info(boost::lexical_cast<std::string>(format))\r
                //                                                                               << arg_name_info("format"));\r
        else if(displayModeSupport == bmdDisplayModeSupportedWithConversion)\r
@@ -134,14 +134,14 @@ static CComPtr<IDeckLink> get_device(size_t device_index)
 {\r
        CComPtr<IDeckLinkIterator> pDecklinkIterator;\r
        if(FAILED(pDecklinkIterator.CoCreateInstance(CLSID_CDeckLinkIterator)))\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Decklink drivers not found."));\r
+               CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Decklink drivers not found."));\r
                \r
        size_t n = 0;\r
        CComPtr<IDeckLink> decklink;\r
        while(n < device_index && pDecklinkIterator->Next(&decklink) == S_OK){++n;}     \r
 \r
        if(n != device_index || !decklink)\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Decklink device not found.") << arg_name_info("device_index") << arg_value_info(boost::lexical_cast<std::string>(device_index)));\r
+               CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Decklink device not found.") << arg_name_info("device_index") << arg_value_info(boost::lexical_cast<std::string>(device_index)));\r
                \r
        return decklink;\r
 }\r