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

diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index 71958c4c7b18dbbddaa3e68a91d239f5e982b250..e22f63b00dadf50707cf36c638a197592a7ae3b4 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -149,4 +149,16 @@ static void throw_on_ffmpeg_error(int ret, const std::wstring& source, const cha
                return ret;                                                                                                                     \\r
        }()\r
 \r
+#define LOG_ON_ERROR2(call, source)                                                                                    \\r
+       [&]() -> int                                                                                                                    \\r
+       {                                       \\r
+               int ret = -1;\\r
+               try{                                                                                                                            \\r
+                ret = call;                                                                                                                    \\r
+               throw_on_ffmpeg_error(ret, source, THROW_ON_ERROR_STR(call), __FUNCTION__, __FILE__, __LINE__); \\r
+               return ret;                                                                                                                     \\r
+               }catch(...){CASPAR_LOG_CURRENT_EXCEPTION();}                                            \\r
+               return ret;                                                                                                                     \\r
+       }()\r
+\r
 }}
\ No newline at end of file