1From 2e75bb8b2c7f70c5d16c9e3d14b1427f4eb80c9c Mon Sep 17 00:00:00 2001
2From: Korynkai <matt@qmxtech.com>
3Date: Thu, 17 Aug 2023 21:10:31 +0200
4Subject: [PATCH] mod_av: fix build with ffmpeg 6.0
5
6Upstream: https://github.com/signalwire/freeswitch/issues/2202
7
8Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
9---
10 src/mod/applications/mod_av/avformat.c | 2 ++
11 src/mod/applications/mod_av/mod_av.h   | 1 +
12 2 files changed, 3 insertions(+)
13
14diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
15index 69475c169f..0a1662aed6 100644
16--- a/src/mod/applications/mod_av/avformat.c
17+++ b/src/mod/applications/mod_av/avformat.c
18@@ -455,6 +455,7 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const cha
19 	}
20
21 	s->oformat = oformat;
22+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_N)
23 	if (s->oformat->priv_data_size > 0) {
24 		s->priv_data = av_mallocz(s->oformat->priv_data_size);
25 		if (!s->priv_data) {
26@@ -468,6 +469,7 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const cha
27 	} else {
28 		s->priv_data = NULL;
29 	}
30+#endif
31
32 	if (filename) {
33 #if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,7,100))
34diff --git a/src/mod/applications/mod_av/mod_av.h b/src/mod/applications/mod_av/mod_av.h
35index a89e6cb8f7..ef9bd48d73 100644
36--- a/src/mod/applications/mod_av/mod_av.h
37+++ b/src/mod/applications/mod_av/mod_av.h
38@@ -42,6 +42,7 @@
39
40 #define LIBAVCODEC_V 59
41 #define LIBAVFORMAT_V 59
42+#define LIBAVFORMAT_N 60
43 #define LIBAVUTIL_V 57
44
45 struct mod_av_globals {
46--
472.39.2
48
49