commit 8c43f8fee9e1380348fc46f563f47871f52f76ff Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Feb 28 15:45:09 2023 +0000 Apply patch ffmpeg6.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ gpac.spec | 1 + 2 files changed, 43 insertions(+) --- diff --git a/ffmpeg6.patch b/ffmpeg6.patch new file mode 100644 index 0000000..91f298a --- /dev/null +++ b/ffmpeg6.patch @@ -0,0 +1,42 @@ +diff -uNrp a/src/filters/ff_common.h b/src/filters/ff_common.h +--- a/src/filters/ff_common.h 2022-12-19 16:03:06.000000000 +0000 ++++ b/src/filters/ff_common.h 2023-02-28 15:41:54.481172893 +0000 +@@ -46,7 +46,7 @@ + #define FF_FREE_PCK(_pkt) av_free_packet(_pkt); + #define FF_RELEASE_PCK(_pkt) + #define FF_INIT_PCK(ctx, _pkt) { pkt = &ctx->pkt; av_init_packet(pkt); } +-#define FF_OFMT_CAST (AVOutputFormat *) ++#define FF_OFMT_CAST (FFOutputFormat *) + #define FF_IFMT_CAST (AVInputFormat *) + #else + #define FF_FREE_PCK(_pkt) av_packet_unref(_pkt); +diff -uNrp a/src/filters/ff_mx.c b/src/filters/ff_mx.c +--- a/src/filters/ff_mx.c 2022-12-19 16:03:06.000000000 +0000 ++++ b/src/filters/ff_mx.c 2023-02-28 15:42:44.758941007 +0000 +@@ -229,7 +229,7 @@ static GF_Err ffmx_open_url(GF_FFMuxCtx + { + const char *dst; + Bool use_gfio=GF_FALSE; +- const AVOutputFormat *ofmt = ctx->muxer->oformat; ++ const FFOutputFormat *ofmt = ctx->muxer->oformat; + + dst = final_name ? final_name : ctx->dst; + if (!strncmp(dst, "gfio://", 7)) { +@@ -280,7 +280,7 @@ static GF_Err ffmx_open_url(GF_FFMuxCtx + static GF_Err ffmx_initialize_ex(GF_Filter *filter, Bool use_templates) + { + const char *url, *sep; +- const AVOutputFormat *ofmt; ++ const FFOutputFormat *ofmt; + GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter); + + if (!ctx->dst) return GF_BAD_PARAM; +@@ -1358,7 +1358,7 @@ static GF_FilterProbeScore ffmx_probe_ur + return GF_FPROBE_NOT_SUPPORTED; + + +- const AVOutputFormat *ofmt = av_guess_format(NULL, url, mime); ++ const FFOutputFormat *ofmt = av_guess_format(NULL, url, mime); + if (!ofmt && mime) ofmt = av_guess_format(NULL, NULL, mime); + if (!ofmt && url) ofmt = av_guess_format(NULL, url, NULL); + diff --git a/gpac.spec b/gpac.spec index 04ffb87..abd8a03 100644 --- a/gpac.spec +++ b/gpac.spec @@ -25,6 +25,7 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta Patch0: gpac-doxygen_195.patch Patch1: Revert-revert-ffmx-gfio.patch +Patch2: ffmpeg6.patch BuildRequires: SDL2-devel BuildRequires: a52dec-devel