From e99c3c413c201417a91e3596888cdcc49d9badb3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Apr 2024 13:44:27 +0200 Subject: [PATCH] package/freeswitch: fix build with ffmpeg 6.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...002-mod_av-fix-build-with-ffmpeg-6.0.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/freeswitch/0002-mod_av-fix-build-with-ffmpeg-6.0.patch diff --git a/package/freeswitch/0002-mod_av-fix-build-with-ffmpeg-6.0.patch b/package/freeswitch/0002-mod_av-fix-build-with-ffmpeg-6.0.patch new file mode 100644 index 0000000000..bd38d76d85 --- /dev/null +++ b/package/freeswitch/0002-mod_av-fix-build-with-ffmpeg-6.0.patch @@ -0,0 +1,48 @@ +From 2e75bb8b2c7f70c5d16c9e3d14b1427f4eb80c9c Mon Sep 17 00:00:00 2001 +From: Korynkai +Date: Thu, 17 Aug 2023 21:10:31 +0200 +Subject: [PATCH] mod_av: fix build with ffmpeg 6.0 + +Upstream: https://github.com/signalwire/freeswitch/issues/2202 + +Signed-off-by: Bernd Kuhls +--- + src/mod/applications/mod_av/avformat.c | 2 ++ + src/mod/applications/mod_av/mod_av.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c +index 69475c169f..0a1662aed6 100644 +--- a/src/mod/applications/mod_av/avformat.c ++++ b/src/mod/applications/mod_av/avformat.c +@@ -455,6 +455,7 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const cha + } + + s->oformat = oformat; ++#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_N) + if (s->oformat->priv_data_size > 0) { + s->priv_data = av_mallocz(s->oformat->priv_data_size); + if (!s->priv_data) { +@@ -468,6 +469,7 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const cha + } else { + s->priv_data = NULL; + } ++#endif + + if (filename) { + #if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,7,100)) +diff --git a/src/mod/applications/mod_av/mod_av.h b/src/mod/applications/mod_av/mod_av.h +index a89e6cb8f7..ef9bd48d73 100644 +--- a/src/mod/applications/mod_av/mod_av.h ++++ b/src/mod/applications/mod_av/mod_av.h +@@ -42,6 +42,7 @@ + + #define LIBAVCODEC_V 59 + #define LIBAVFORMAT_V 59 ++#define LIBAVFORMAT_N 60 + #define LIBAVUTIL_V 57 + + struct mod_av_globals { +-- +2.39.2 +