From 577bb66c1fdf84c8078a5704f91e934e41374252 Mon Sep 17 00:00:00 2001 From: zmckevitt Date: Thu, 5 Sep 2024 17:45:15 -0600 Subject: [PATCH] Fixed compiler error for av_err2string by redefining in c++ friendly way --- src/core/libraries/avplayer/avplayer_source.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/core/libraries/avplayer/avplayer_source.cpp b/src/core/libraries/avplayer/avplayer_source.cpp index 99ba2e8b6..51cd4bbd8 100644 --- a/src/core/libraries/avplayer/avplayer_source.cpp +++ b/src/core/libraries/avplayer/avplayer_source.cpp @@ -20,6 +20,18 @@ extern "C" { #include } +// The av_err2str macro in libavutil/error.h does not play nice with C++ +// More info: https://github.com/joncampbell123/composite-video-simulator/issues/5 +#ifdef av_err2str +#undef av_err2str +#include +av_always_inline std::string av_err2string(int errnum) { + char errbuf[AV_ERROR_MAX_STRING_SIZE]; + return av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum); +} +#define av_err2str(err) av_err2string(err).c_str() +#endif // av_err2str + namespace Libraries::AvPlayer { using namespace Kernel;