Rebase to version 5.1

2022-08-24 07:05:00 -04:00 · 2022-08-24 07:05:00 -04:00 · d4753c2533
parent 19be51f626
commit d4753c2533
11 changed files with 175 additions and 241 deletions
--- a/1
+++ b/1
@ -24,6 +24,7 @@ libcodec2 # codec2
 libdav1d # av1
 libgsm # libgsm
 libilbc # ilbc
+libjxl # libjxl
 libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
 libopus # opus
--- a/1
+++ b/1
@ -29,6 +29,7 @@ libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
 libilbc # ilbc
+libjxl # libjxl
 libmp3lame # lame
 libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
--- a/ffmpeg-dlopen-openh264.patch
+++ b/ffmpeg-dlopen-openh264.patch
@ -12,22 +12,22 @@ Co-authored-by: Neal Gompa <ngompa@fedoraproject.org>
 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
 ---
- configure                       |   3 +
- libavcodec/Makefile             |   1 +
- libavcodec/libopenh264.c        |  15 +++-
- libavcodec/libopenh264_dlopen.c | 147 ++++++++++++++++++++++++++++++++
- libavcodec/libopenh264_dlopen.h |  58 +++++++++++++
- libavcodec/libopenh264dec.c     |  10 +++
- libavcodec/libopenh264enc.c     |  10 +++
+ configure                       |    3 
+ libavcodec/Makefile             |    1 
+ libavcodec/libopenh264.c        |   15 +++-
+ libavcodec/libopenh264_dlopen.c |  147 ++++++++++++++++++++++++++++++++++++++++
+ libavcodec/libopenh264_dlopen.h |   58 +++++++++++++++
+ libavcodec/libopenh264dec.c     |   10 ++
+ libavcodec/libopenh264enc.c     |   10 ++
 7 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/libopenh264_dlopen.c
 create mode 100644 libavcodec/libopenh264_dlopen.h

-diff --git a/configure b/configure
-index 6b5ef6332e..f08e566e98 100755
--- a/configure
-+++ b/configure
-@@ -250,6 +250,7 @@ External library support:
+Index: ffmpeg-5.1/configure
+===================================================================
+--- ffmpeg-5.1.orig/configure
+++ ffmpeg-5.1/configure
+@@ -252,6 +252,7 @@ External library support:
   --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
   --enable-libopencv       enable video filtering via libopencv [no]
   --enable-libopenh264     enable H.264 encoding via OpenH264 [no]
@ -35,7 +35,7 @@ index 6b5ef6332e..f08e566e98 100755
   --enable-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
   --enable-libopenmpt      enable decoding tracked files via libopenmpt [no]
   --enable-libopenvino     enable OpenVINO as a DNN module backend
-@@ -1839,6 +1840,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1846,6 +1847,7 @@ EXTERNAL_LIBRARY_LIST="
     libmysofa
     libopencv
     libopenh264
@ -43,7 +43,7 @@ index 6b5ef6332e..f08e566e98 100755
     libopenjpeg
     libopenmpt
     libopenvino
-@@ -6575,6 +6577,7 @@ enabled libopencv         && { check_headers opencv2/core/core_c.h &&
+@@ -6599,6 +6601,7 @@ enabled libopencv         && { check_hea
                                  require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
 enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
@ -51,11 +51,11 @@ index 6b5ef6332e..f08e566e98 100755
 enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
 enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 3adf1536d8..9dc8389ce2 100644
--- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -1058,6 +1058,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o
+Index: ffmpeg-5.1/libavcodec/Makefile
+===================================================================
+--- ffmpeg-5.1.orig/libavcodec/Makefile
+++ ffmpeg-5.1/libavcodec/Makefile
+@@ -1075,6 +1075,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)  += libopencore-amr.o
 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o
 OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)  += libopencore-amr.o
@ -63,10 +63,10 @@ index 3adf1536d8..9dc8389ce2 100644
 OBJS-$(CONFIG_LIBOPENH264_DECODER)        += libopenh264dec.o libopenh264.o
 OBJS-$(CONFIG_LIBOPENH264_ENCODER)        += libopenh264enc.o libopenh264.o
 OBJS-$(CONFIG_LIBOPENJPEG_DECODER)        += libopenjpegdec.o
-diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
-index 59c61a3a4c..9b7dfc59be 100644
--- a/libavcodec/libopenh264.c
-+++ b/libavcodec/libopenh264.c
+Index: ffmpeg-5.1/libavcodec/libopenh264.c
+===================================================================
+--- ffmpeg-5.1.orig/libavcodec/libopenh264.c
+++ ffmpeg-5.1/libavcodec/libopenh264.c
@@ -20,8 +20,13 @@
  */
 
@ -79,9 +79,9 @@ index 59c61a3a4c..9b7dfc59be 100644
 #include <wels/codec_ver.h>
 +#endif
 
+ #include "libavutil/error.h"
 #include "libavutil/log.h"
- 
-@@ -52,7 +57,15 @@ int ff_libopenh264_check_version(void *logctx)
+@@ -53,7 +58,15 @@ int ff_libopenh264_check_version(void *l
     // function (for functions returning larger structs), thus skip the check in those
     // configurations.
 #if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
@ -98,11 +98,10 @@ index 59c61a3a4c..9b7dfc59be 100644
     if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
         av_log(logctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
         return AVERROR(EINVAL);
-diff --git a/libavcodec/libopenh264_dlopen.c b/libavcodec/libopenh264_dlopen.c
-new file mode 100644
-index 0000000000..b350679f18
+Index: ffmpeg-5.1/libavcodec/libopenh264_dlopen.c
+===================================================================
 --- /dev/null
-+++ b/libavcodec/libopenh264_dlopen.c
+++ ffmpeg-5.1/libavcodec/libopenh264_dlopen.c
@@ -0,0 +1,147 @@
 +/*
 + * OpenH264 dlopen code
@ -251,11 +250,10 @@ index 0000000000..b350679f18
 +
 +  return 0;
 +}
-diff --git a/libavcodec/libopenh264_dlopen.h b/libavcodec/libopenh264_dlopen.h
-new file mode 100644
-index 0000000000..d7d8bb7cad
+Index: ffmpeg-5.1/libavcodec/libopenh264_dlopen.h
+===================================================================
 --- /dev/null
-+++ b/libavcodec/libopenh264_dlopen.h
+++ ffmpeg-5.1/libavcodec/libopenh264_dlopen.h
@@ -0,0 +1,58 @@
 +/*
 + * OpenH264 dlopen code
@ -315,10 +313,10 @@ index 0000000000..d7d8bb7cad
 +#endif /* CONFIG_LIBOPENH264_DLOPEN */
 +
 +#endif /* HAVE_LIBOPENH264_DLOPEN_H */
-diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
-index 97d3630df6..feb0a0927e 100644
--- a/libavcodec/libopenh264dec.c
-+++ b/libavcodec/libopenh264dec.c
+Index: ffmpeg-5.1/libavcodec/libopenh264dec.c
+===================================================================
+--- ffmpeg-5.1.orig/libavcodec/libopenh264dec.c
+++ ffmpeg-5.1/libavcodec/libopenh264dec.c
@@ -19,8 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
@ -332,7 +330,7 @@ index 97d3630df6..feb0a0927e 100644
 
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
-@@ -55,6 +59,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
+@@ -56,6 +60,12 @@ static av_cold int svc_decode_init(AVCod
     int log_level;
     WelsTraceCallback callback_function;
 
@ -345,10 +343,10 @@ index 97d3630df6..feb0a0927e 100644
     if ((err = ff_libopenh264_check_version(avctx)) < 0)
         return AVERROR_DECODER_NOT_FOUND;
 
-diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
-index 2001dc22b4..c8b1348df2 100644
--- a/libavcodec/libopenh264enc.c
-+++ b/libavcodec/libopenh264enc.c
+Index: ffmpeg-5.1/libavcodec/libopenh264enc.c
+===================================================================
+--- ffmpeg-5.1.orig/libavcodec/libopenh264enc.c
+++ ffmpeg-5.1/libavcodec/libopenh264enc.c
@@ -19,8 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
@ -362,7 +360,7 @@ index 2001dc22b4..c8b1348df2 100644
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
-@@ -136,6 +140,12 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
+@@ -137,6 +141,12 @@ static av_cold int svc_encode_init(AVCod
     WelsTraceCallback callback_function;
     AVCPBProperties *props;
 
@ -375,6 +373,3 @@ index 2001dc22b4..c8b1348df2 100644
     if ((err = ff_libopenh264_check_version(avctx)) < 0)
         return AVERROR_ENCODER_NOT_FOUND;
 
-- 
-2.34.1
-
--- a/ffmpeg-fix-exif-include.patch
+++ b/ffmpeg-fix-exif-include.patch
@ -1,95 +0,0 @@
-From fe17c9fadf375d8beeb42b062390dfe18cb59e08 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 11 Feb 2022 09:46:15 +0100
-Subject: [PATCH 1/2] avcodec/exif: Include bytestream.h for GetByteContext
-
-bytestream.h should be directly included for GetByteContext and not
-rely on other headers to include it. It could be removed from there.
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
- libavcodec/exif.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libavcodec/exif.h b/libavcodec/exif.h
-index 4db84a1c2f..310f6e8e64 100644
--- a/libavcodec/exif.h
-+++ b/libavcodec/exif.h
-@@ -30,6 +30,7 @@
- 
- #include <stdint.h>
- #include "libavutil/dict.h"
-+#include "bytestream.h"
- #include "tiff.h"
- 
- #define EXIF_MAX_IFD_RECURSION 2
-- 
-2.34.1
-
-
-From 45a9f8044ef6dc425209141e3d9272008ce6bbff Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 11 Feb 2022 09:49:25 +0100
-Subject: [PATCH 2/2] avcodec/exif: Include tiff_common.h only where needed
-
-The exif.h header doesn't use anything from tiff.h.
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
- libavcodec/exif.c     | 1 +
- libavcodec/exif.h     | 1 -
- libavcodec/mjpegdec.c | 1 +
- libavcodec/webp.c     | 1 +
- 4 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libavcodec/exif.c b/libavcodec/exif.c
-index 0b656fd09b..9485b24b8e 100644
--- a/libavcodec/exif.c
-+++ b/libavcodec/exif.c
-@@ -26,6 +26,7 @@
-  */
- 
- #include "exif.h"
-+#include "tiff_common.h"
- 
- 
- static const char *exif_get_tag_name(uint16_t id)
-diff --git a/libavcodec/exif.h b/libavcodec/exif.h
-index 310f6e8e64..ffacba7e66 100644
--- a/libavcodec/exif.h
-+++ b/libavcodec/exif.h
-@@ -31,7 +31,6 @@
- #include <stdint.h>
- #include "libavutil/dict.h"
- #include "bytestream.h"
-#include "tiff.h"
- 
- #define EXIF_MAX_IFD_RECURSION 2
- #define EXIF_TAG_NAME_LENGTH   32
-diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
-index a735d2337d..267609d96a 100644
--- a/libavcodec/mjpegdec.c
-+++ b/libavcodec/mjpegdec.c
-@@ -50,6 +50,7 @@
- #include "tiff.h"
- #include "exif.h"
- #include "bytestream.h"
-+#include "tiff_common.h"
- 
- 
- static int init_default_huffman_tables(MJpegDecodeContext *s)
-diff --git a/libavcodec/webp.c b/libavcodec/webp.c
-index 9e642e050a..148dc02170 100644
--- a/libavcodec/webp.c
-+++ b/libavcodec/webp.c
-@@ -48,6 +48,7 @@
- #include "exif.h"
- #include "get_bits.h"
- #include "internal.h"
-+#include "tiff_common.h"
- #include "thread.h"
- #include "vp8.h"
- 
-- 
-2.34.1
-
--- a/ffmpeg-fix-gnutls-priority.patch
+++ b/ffmpeg-fix-gnutls-priority.patch
@ -1,13 +0,0 @@
-Index: ffmpeg-5.0/libavformat/tls_gnutls.c
-===================================================================
--- ffmpeg-5.0.orig/libavformat/tls_gnutls.c	2022-01-14 19:45:40.000000000 +0100
-+++ ffmpeg-5.0/libavformat/tls_gnutls.c	2022-02-10 23:06:52.364362893 +0100
-@@ -192,7 +192,7 @@ static int tls_open(URLContext *h, const
-     gnutls_transport_set_pull_function(p->session, gnutls_url_pull);
-     gnutls_transport_set_push_function(p->session, gnutls_url_push);
-     gnutls_transport_set_ptr(p->session, p);
-    gnutls_priority_set_direct(p->session, "NORMAL", NULL);
-+    gnutls_set_default_priority(p->session);
-     do {
-         if (ff_check_interrupt(&h->interrupt_callback)) {
-             ret = AVERROR_EXIT;
--- a/ffmpeg-openh264-averr-on-bad-version.patch
+++ b/ffmpeg-openh264-averr-on-bad-version.patch
@ -1,38 +0,0 @@
-From b3b0ff6ef4b5bb3e2bf9649f1d7130f123f90099 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 18 Feb 2022 13:42:17 +0100
-Subject: [PATCH] avcodec/openh264: Return (DE|EN)CODER_NOT_FOUND if version
- check fails
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
- libavcodec/libopenh264dec.c | 2 +-
- libavcodec/libopenh264enc.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
-index 7f5e85402a26..97d3630df6cf 100644
--- a/libavcodec/libopenh264dec.c
-+++ b/libavcodec/libopenh264dec.c
-@@ -56,7 +56,7 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
-     WelsTraceCallback callback_function;
- 
-     if ((err = ff_libopenh264_check_version(avctx)) < 0)
-        return err;
-+        return AVERROR_DECODER_NOT_FOUND;
- 
-     if (WelsCreateDecoder(&s->decoder)) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
-diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
-index de4b85c411e0..2001dc22b4c3 100644
--- a/libavcodec/libopenh264enc.c
-+++ b/libavcodec/libopenh264enc.c
-@@ -137,7 +137,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
-     AVCPBProperties *props;
- 
-     if ((err = ff_libopenh264_check_version(avctx)) < 0)
-        return err;
-+        return AVERROR_ENCODER_NOT_FOUND;
- 
-     if (WelsCreateSVCEncoder(&s->encoder)) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@ -73,8 +73,8 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}

-Version:        5.0.1
-Release:        16%{?dist}
+Version:        5.1
+Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPLv3+
 URL:            https://ffmpeg.org/
@ -92,22 +92,13 @@ Source90:       ffmpeg_update_free_sources.sh
 Source91:       ffmpeg_gen_free_tarball.sh
 Source92:       ffmpeg_get_dlopen_headers.sh

-# Change path from /usr/local to /usr
-Patch1:         fix-vmaf-model-path.patch
-# Some header cleanup
-# http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/292877.html
-Patch2:         ffmpeg-fix-exif-include.patch
 # Fixes for reduced codec selection on free build
-Patch3:         ffmpeg-codec-choice.patch
+Patch1:         ffmpeg-codec-choice.patch
 # Better error messages for free build
-Patch4:         ffmpeg-new-coder-errors.patch
+Patch2:         ffmpeg-new-coder-errors.patch
 # Allow to build with fdk-aac-free
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
-Patch5:         ffmpeg-allow-fdk-aac-free.patch
-# http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/292853.html
-Patch6:         ffmpeg-fix-gnutls-priority.patch
-# http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/293194.html
-Patch7:         ffmpeg-openh264-averr-on-bad-version.patch
+Patch3:         ffmpeg-allow-fdk-aac-free.patch

 # Set up dlopen for openh264
 Patch1001:      ffmpeg-dlopen-openh264.patch
@ -163,6 +154,7 @@ BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libchromaprint)
 %endif
 BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libomxil-bellagio)
 BuildRequires:  pkgconfig(libopenjp2)
@ -592,6 +584,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
    --enable-libgsm \
    --enable-libilbc \
    --enable-libjack \
+    --enable-libjxl \
    --enable-libmodplug \
    --enable-libmp3lame \
    --enable-libmysofa \
@ -698,21 +691,22 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
    || cat ffbuild/config.log

 cat config.h
+cat config_components.h

 # Paranoia check
 %if %{without all_codecs}
 # DECODER
 for i in MPEG4 H263 H264 HEVC HEVC_RKMPP VC1; do
-    grep -q "#define CONFIG_${i}_DECODER 0" config.h
+    grep -q "#define CONFIG_${i}_DECODER 0" config_components.h
 done

 # ENCODER
 for i in MPEG4 H263 H263P LIBX264 LIBX264RGB LIBX265 LIBXVID; do
-    grep -q "#define CONFIG_${i}_ENCODER 0" config.h
+    grep -q "#define CONFIG_${i}_ENCODER 0" config_components.h
 done
 for i in H264 HEVC; do
    for j in MF VIDEOTOOLBOX; do
-        grep -q "#define CONFIG_${i}_${j}_ENCODER 0" config.h
+        grep -q "#define CONFIG_${i}_${j}_ENCODER 0" config_components.h
    done
 done
 %endif
@ -850,6 +844,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*

 %changelog
+* Wed Aug 24 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.1-1
+- Rebase to version 5.1
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

--- a/118
+++ b/118
@ -139,9 +139,13 @@ fftools/ffmpeg.c
 fftools/ffmpeg.h
 fftools/ffmpeg_filter.c
 fftools/ffmpeg_hw.c
+fftools/ffmpeg_mux.c
 fftools/ffmpeg_opt.c
 fftools/ffplay.c
 fftools/ffprobe.c
+fftools/fopen_utf8.h
+fftools/opt_common.c
+fftools/opt_common.h
 libavcodec/Makefile
 libavcodec/aac_ac3_parser.c
 libavcodec/aac_ac3_parser.h
@ -207,6 +211,7 @@ libavcodec/ac3dec.h
 libavcodec/ac3dec_data.c
 libavcodec/ac3dec_data.h
 libavcodec/ac3dec_float.c
+libavcodec/ac3defs.h
 libavcodec/ac3dsp.c
 libavcodec/ac3dsp.h
 libavcodec/ac3enc.c
@ -343,6 +348,8 @@ libavcodec/avdct.h
 libavcodec/avfft.c
 libavcodec/avfft.h
 libavcodec/avpacket.c
+libavcodec/avs2.c
+libavcodec/avs2.h
 libavcodec/avs2_parser.c
 libavcodec/avs3.h
 libavcodec/avs3_parser.c
@ -403,6 +410,7 @@ libavcodec/codec2utils.h
 libavcodec/codec_desc.c
 libavcodec/codec_desc.h
 libavcodec/codec_id.h
+libavcodec/codec_internal.h
 libavcodec/codec_par.c
 libavcodec/codec_par.h
 libavcodec/cook_parser.c
@ -464,6 +472,7 @@ libavcodec/dovi_rpu.h
 libavcodec/dpx_parser.c
 libavcodec/dump_extradata_bsf.c
 libavcodec/dv.h
+libavcodec/dv_error_marker_bsf.c
 libavcodec/dv_profile.c
 libavcodec/dv_profile.h
 libavcodec/dv_profile_internal.h
@ -476,6 +485,8 @@ libavcodec/dvdsub_parser.c
 libavcodec/dxva2.h
 libavcodec/dynamic_hdr10_plus.c
 libavcodec/dynamic_hdr10_plus.h
+libavcodec/dynamic_hdr_vivid.c
+libavcodec/dynamic_hdr_vivid.h
 libavcodec/eac3_core_bsf.c
 libavcodec/eac3_data.h
 libavcodec/eac3dec.c
@ -529,7 +540,11 @@ libavcodec/flacdsp.h
 libavcodec/flacdsp_lpc_template.c
 libavcodec/flacdsp_template.c
 libavcodec/flacenc.c
-libavcodec/flv.h
+libavcodec/float2half.h
+libavcodec/flvdec.c
+libavcodec/flvdec.h
+libavcodec/flvenc.c
+libavcodec/flvenc.h
 libavcodec/fmtconvert.c
 libavcodec/fmtconvert.h
 libavcodec/frame_thread_encoder.c
@ -539,6 +554,7 @@ libavcodec/g723_1_parser.c
 libavcodec/g729.h
 libavcodec/g729_parser.c
 libavcodec/get_bits.h
+libavcodec/get_buffer.c
 libavcodec/gif.c
 libavcodec/gif.h
 libavcodec/gif_parser.c
@ -553,6 +569,9 @@ libavcodec/gsmdec_data.h
 libavcodec/gsmdec_template.c
 libavcodec/h261.h
 libavcodec/h261_parser.c
+libavcodec/h261dec.c
+libavcodec/h261enc.c
+libavcodec/h261enc.h
 libavcodec/h263.c
 libavcodec/h263.h
 libavcodec/h263_parser.c
@ -560,8 +579,10 @@ libavcodec/h263_parser.h
 libavcodec/h263data.c
 libavcodec/h263data.h
 libavcodec/h263dec.c
+libavcodec/h263dec.h
 libavcodec/h263dsp.c
 libavcodec/h263dsp.h
+libavcodec/h263enc.h
 libavcodec/h264.h
 libavcodec/h2645_parse.c
 libavcodec/h2645_parse.h
@ -685,6 +706,10 @@ libavcodec/libfdk-aacenc.c
 libavcodec/libgsmdec.c
 libavcodec/libgsmenc.c
 libavcodec/libilbc.c
+libavcodec/libjxl.c
+libavcodec/libjxl.h
+libavcodec/libjxldec.c
+libavcodec/libjxlenc.c
 libavcodec/libmp3lame.c
 libavcodec/libopenh264.c
 libavcodec/libopenh264.h
@ -763,7 +788,9 @@ libavcodec/mpeg12.h
 libavcodec/mpeg12data.c
 libavcodec/mpeg12data.h
 libavcodec/mpeg12dec.c
+libavcodec/mpeg12dec.h
 libavcodec/mpeg12enc.c
+libavcodec/mpeg12enc.h
 libavcodec/mpeg12framerate.c
 libavcodec/mpeg12vlc.h
 libavcodec/mpeg2_metadata_bsf.c
@ -777,7 +804,10 @@ libavcodec/mpeg4video.c
 libavcodec/mpeg4video.h
 libavcodec/mpeg4video_parser.c
 libavcodec/mpeg4video_parser.h
+libavcodec/mpeg4videodata.h
 libavcodec/mpeg4videodec.c
+libavcodec/mpeg4videodec.h
+libavcodec/mpeg4videoenc.h
 libavcodec/mpeg_er.c
 libavcodec/mpeg_er.h
 libavcodec/mpegaudio.c
@ -811,13 +841,16 @@ libavcodec/mpegutils.c
 libavcodec/mpegutils.h
 libavcodec/mpegvideo.c
 libavcodec/mpegvideo.h
+libavcodec/mpegvideo_dec.c
 libavcodec/mpegvideo_enc.c
 libavcodec/mpegvideo_motion.c
 libavcodec/mpegvideo_parser.c
 libavcodec/mpegvideodata.c
 libavcodec/mpegvideodata.h
+libavcodec/mpegvideodec.h
 libavcodec/mpegvideodsp.c
 libavcodec/mpegvideodsp.h
+libavcodec/mpegvideoenc.h
 libavcodec/mpegvideoencdsp.c
 libavcodec/mpegvideoencdsp.h
 libavcodec/mqc.c
@ -828,6 +861,8 @@ libavcodec/msgsmdec.c
 libavcodec/msgsmdec.h
 libavcodec/msmpeg4.h
 libavcodec/msmpeg4data.h
+libavcodec/msmpeg4dec.h
+libavcodec/msmpeg4enc.h
 libavcodec/msrledec.c
 libavcodec/msrledec.h
 libavcodec/neon/Makefile
@ -883,6 +918,7 @@ libavcodec/pcm_tablegen.h
 libavcodec/pcx.c
 libavcodec/pcxenc.c
 libavcodec/pel_template.c
+libavcodec/pgs_frame_merge_bsf.c
 libavcodec/pgssubdec.c
 libavcodec/pgxdec.c
 libavcodec/pixblockdsp.c
@ -940,6 +976,8 @@ libavcodec/pthread_frame.c
 libavcodec/pthread_internal.h
 libavcodec/pthread_slice.c
 libavcodec/put_bits.h
+libavcodec/put_golomb.h
+libavcodec/qoi_parser.c
 libavcodec/qpel_template.c
 libavcodec/qpeldsp.c
 libavcodec/qpeldsp.h
@ -973,7 +1011,9 @@ libavcodec/rl.h
 libavcodec/rle.c
 libavcodec/rle.h
 libavcodec/rnd_avg.h
-libavcodec/rv10.h
+libavcodec/rv10dec.h
+libavcodec/rv10enc.c
+libavcodec/rv10enc.h
 libavcodec/rv34_parser.c
 libavcodec/sbc.h
 libavcodec/sbc_parser.c
@ -1010,6 +1050,7 @@ libavcodec/targaenc.c
 libavcodec/textdec.c
 libavcodec/texturedsp.h
 libavcodec/thread.h
+libavcodec/threadframe.h
 libavcodec/tiff.c
 libavcodec/tiff.h
 libavcodec/tiff_common.c
@ -1026,8 +1067,10 @@ libavcodec/utils.c
 libavcodec/v210_template.c
 libavcodec/v210dec.c
 libavcodec/v210dec.h
+libavcodec/v210dec_init.h
 libavcodec/v210enc.c
 libavcodec/v210enc.h
+libavcodec/v210enc_init.h
 libavcodec/v210x.c
 libavcodec/v308dec.c
 libavcodec/v308enc.c
@ -1061,6 +1104,7 @@ libavcodec/vaapi_mjpeg.c
 libavcodec/vaapi_mpeg2.c
 libavcodec/vaapi_vp8.c
 libavcodec/vaapi_vp9.c
+libavcodec/vbn.h
 libavcodec/vc1.c
 libavcodec/vc1.h
 libavcodec/vc1_common.h
@ -1073,14 +1117,18 @@ libavcodec/vc1dsp.c
 libavcodec/vc1dsp.h
 libavcodec/vdpau.c
 libavcodec/vdpau.h
+libavcodec/vdpau_av1.c
 libavcodec/vdpau_internal.h
 libavcodec/vdpau_mpeg12.c
 libavcodec/vdpau_vp9.c
+libavcodec/version.c
 libavcodec/version.h
+libavcodec/version_major.h
 libavcodec/videodsp.c
 libavcodec/videodsp.h
 libavcodec/videodsp_template.c
 libavcodec/videotoolbox.h
+libavcodec/vlc.c
 libavcodec/vlc.h
 libavcodec/vorbis.c
 libavcodec/vorbis.h
@ -1147,7 +1195,9 @@ libavcodec/webvttenc.c
 libavcodec/wmv2.h
 libavcodec/wmv2data.c
 libavcodec/wmv2data.h
+libavcodec/wmv2dec.h
 libavcodec/wmv2dsp.h
+libavcodec/wmv2enc.h
 libavcodec/wrapped_avframe.c
 libavcodec/x86/Makefile
 libavcodec/x86/ac3dsp.asm
@ -1293,7 +1343,6 @@ libavcodec/xiph.h
 libavcodec/xma_parser.c
 libavcodec/xvididct.h
 libavcodec/xvmc.h
-libavcodec/xvmc_internal.h
 libavcodec/xwd.h
 libavcodec/xwddec.c
 libavcodec/xwdenc.c
@ -1301,6 +1350,8 @@ libavcodec/y41pdec.c
 libavcodec/y41penc.c
 libavcodec/yuv4dec.c
 libavcodec/yuv4enc.c
+libavcodec/zlib_wrapper.c
+libavcodec/zlib_wrapper.h
 libavdevice/Makefile
 libavdevice/alldevices.c
 libavdevice/alsa.c
@ -1345,7 +1396,9 @@ libavdevice/v4l2-common.c
 libavdevice/v4l2-common.h
 libavdevice/v4l2.c
 libavdevice/v4l2enc.c
+libavdevice/version.c
 libavdevice/version.h
+libavdevice/version_major.h
 libavdevice/xcbgrab.c
 libavfilter/Makefile
 libavfilter/aarch64/Makefile
@ -1371,6 +1424,7 @@ libavfilter/af_afftdn.c
 libavfilter/af_afftfilt.c
 libavfilter/af_afir.c
 libavfilter/af_afir.h
+libavfilter/af_afirdsp.h
 libavfilter/af_aformat.c
 libavfilter/af_afreqshift.c
 libavfilter/af_afwtdn.c
@ -1414,6 +1468,7 @@ libavfilter/af_crossfeed.c
 libavfilter/af_crystalizer.c
 libavfilter/af_dcshift.c
 libavfilter/af_deesser.c
+libavfilter/af_dialoguenhance.c
 libavfilter/af_drmeter.c
 libavfilter/af_dynaudnorm.c
 libavfilter/af_earwax.c
@ -1441,9 +1496,11 @@ libavfilter/af_superequalizer.c
 libavfilter/af_surround.c
 libavfilter/af_tremolo.c
 libavfilter/af_vibrato.c
+libavfilter/af_virtualbass.c
 libavfilter/af_volume.c
 libavfilter/af_volume.h
 libavfilter/af_volumedetect.c
+libavfilter/afir_template.c
 libavfilter/allfilters.c
 libavfilter/asink_anullsink.c
 libavfilter/asrc_afirsrc.c
@ -1482,6 +1539,7 @@ libavfilter/buffersink.h
 libavfilter/buffersrc.c
 libavfilter/buffersrc.h
 libavfilter/bwdif.h
+libavfilter/colorchannelmixer_template.c
 libavfilter/colorspace.c
 libavfilter/colorspace.h
 libavfilter/colorspacedsp.c
@ -1529,6 +1587,8 @@ libavfilter/drawutils.c
 libavfilter/drawutils.h
 libavfilter/ebur128.c
 libavfilter/ebur128.h
+libavfilter/edge_common.c
+libavfilter/edge_common.h
 libavfilter/f_bench.c
 libavfilter/f_cue.c
 libavfilter/f_drawgraph.c
@ -1592,6 +1652,7 @@ libavfilter/opencl/neighbor.cl
 libavfilter/opencl/nlmeans.cl
 libavfilter/opencl/overlay.cl
 libavfilter/opencl/pad.cl
+libavfilter/opencl/remap.cl
 libavfilter/opencl/tonemap.cl
 libavfilter/opencl/transpose.cl
 libavfilter/opencl/unsharp.cl
@ -1615,6 +1676,7 @@ libavfilter/settb.c
 libavfilter/signature.h
 libavfilter/signature_lookup.c
 libavfilter/split.c
+libavfilter/src_avsynctest.c
 libavfilter/src_movie.c
 libavfilter/ssim.h
 libavfilter/stereo3d.h
@ -1630,7 +1692,9 @@ libavfilter/v360.h
 libavfilter/vaapi_vpp.c
 libavfilter/vaapi_vpp.h
 libavfilter/vaf_spectrumsynth.c
+libavfilter/version.c
 libavfilter/version.h
+libavfilter/version_major.h
 libavfilter/vf_addroi.c
 libavfilter/vf_alphamerge.c
 libavfilter/vf_amplify.c
@ -1645,6 +1709,10 @@ libavfilter/vf_bitplanenoise.c
 libavfilter/vf_blackdetect.c
 libavfilter/vf_blackframe.c
 libavfilter/vf_blend.c
+libavfilter/vf_blend_init.h
+libavfilter/vf_blend_vulkan.c
+libavfilter/vf_blockdetect.c
+libavfilter/vf_blurdetect.c
 libavfilter/vf_bm3d.c
 libavfilter/vf_boxblur.c
 libavfilter/vf_bwdif.c
@ -1664,6 +1732,7 @@ libavfilter/vf_colorize.c
 libavfilter/vf_colorkey.c
 libavfilter/vf_colorkey_opencl.c
 libavfilter/vf_colorlevels.c
+libavfilter/vf_colormap.c
 libavfilter/vf_colormatrix.c
 libavfilter/vf_colorspace.c
 libavfilter/vf_colortemperature.c
@ -1708,6 +1777,7 @@ libavfilter/vf_estdif.c
 libavfilter/vf_exposure.c
 libavfilter/vf_extractplanes.c
 libavfilter/vf_fade.c
+libavfilter/vf_feedback.c
 libavfilter/vf_fftdnoiz.c
 libavfilter/vf_fftfilt.c
 libavfilter/vf_field.c
@ -1729,12 +1799,14 @@ libavfilter/vf_frei0r.c
 libavfilter/vf_fspp.c
 libavfilter/vf_fspp.h
 libavfilter/vf_gblur.c
+libavfilter/vf_gblur_init.h
 libavfilter/vf_gblur_vulkan.c
 libavfilter/vf_geq.c
 libavfilter/vf_gradfun.c
 libavfilter/vf_grayworld.c
 libavfilter/vf_guided.c
 libavfilter/vf_hflip.c
+libavfilter/vf_hflip_init.h
 libavfilter/vf_histeq.c
 libavfilter/vf_histogram.c
 libavfilter/vf_hqdn3d.c
@ -1777,11 +1849,13 @@ libavfilter/vf_mix.c
 libavfilter/vf_monochrome.c
 libavfilter/vf_morpho.c
 libavfilter/vf_mpdecimate.c
+libavfilter/vf_multiply.c
 libavfilter/vf_negate.c
 libavfilter/vf_neighbor.c
 libavfilter/vf_neighbor_opencl.c
 libavfilter/vf_nlmeans.c
 libavfilter/vf_nlmeans.h
+libavfilter/vf_nlmeans_init.h
 libavfilter/vf_nlmeans_opencl.c
 libavfilter/vf_nnedi.c
 libavfilter/vf_noise.c
@ -1793,6 +1867,7 @@ libavfilter/vf_overlay.c
 libavfilter/vf_overlay.h
 libavfilter/vf_overlay_opencl.c
 libavfilter/vf_overlay_qsv.c
+libavfilter/vf_overlay_vaapi.c
 libavfilter/vf_overlay_vulkan.c
 libavfilter/vf_owdenoise.c
 libavfilter/vf_pad.c
@ -1803,6 +1878,7 @@ libavfilter/vf_perspective.c
 libavfilter/vf_phase.c
 libavfilter/vf_photosensitivity.c
 libavfilter/vf_pixdesctest.c
+libavfilter/vf_pixelize.c
 libavfilter/vf_pp.c
 libavfilter/vf_pp7.c
 libavfilter/vf_pp7.h
@ -1818,6 +1894,7 @@ libavfilter/vf_random.c
 libavfilter/vf_readeia608.c
 libavfilter/vf_readvitc.c
 libavfilter/vf_remap.c
+libavfilter/vf_remap_opencl.c
 libavfilter/vf_removegrain.c
 libavfilter/vf_removelogo.c
 libavfilter/vf_repeatfields.c
@ -1841,6 +1918,7 @@ libavfilter/vf_shufflepixels.c
 libavfilter/vf_shuffleplanes.c
 libavfilter/vf_signalstats.c
 libavfilter/vf_signature.c
+libavfilter/vf_siti.c
 libavfilter/vf_smartblur.c
 libavfilter/vf_spp.c
 libavfilter/vf_spp.h
@ -1854,6 +1932,7 @@ libavfilter/vf_swaprect.c
 libavfilter/vf_swapuv.c
 libavfilter/vf_telecine.c
 libavfilter/vf_threshold.c
+libavfilter/vf_threshold_init.h
 libavfilter/vf_thumbnail.c
 libavfilter/vf_tile.c
 libavfilter/vf_tinterlace.c
@ -2034,6 +2113,7 @@ libavformat/argo_brp.c
 libavformat/argo_cvg.c
 libavformat/asf.c
 libavformat/asf.h
+libavformat/asf_tags.c
 libavformat/asfcrypt.c
 libavformat/asfcrypt.h
 libavformat/asfdec_f.c
@ -2052,6 +2132,7 @@ libavformat/av1.h
 libavformat/av1dec.c
 libavformat/avc.c
 libavformat/avc.h
+libavformat/avformat.c
 libavformat/avformat.h
 libavformat/avi.h
 libavformat/avidec.c
@ -2102,8 +2183,11 @@ libavformat/daudenc.c
 libavformat/dca_sample_rate_tab.c
 libavformat/dcstr.c
 libavformat/demux.c
+libavformat/demux.h
+libavformat/demux_utils.c
 libavformat/derf.c
 libavformat/dfa.c
+libavformat/dfpwmdec.c
 libavformat/dhav.c
 libavformat/diracdec.c
 libavformat/dnxhddec.c
@ -2215,6 +2299,7 @@ libavformat/ingenientdec.c
 libavformat/internal.h
 libavformat/ip.c
 libavformat/ip.h
+libavformat/ipfsgateway.c
 libavformat/ipmovie.c
 libavformat/ipudec.c
 libavformat/ircam.c
@ -2231,6 +2316,8 @@ libavformat/ivfenc.c
 libavformat/jacosubdec.c
 libavformat/jacosubenc.c
 libavformat/jpegtables.c
+libavformat/jpegxl_probe.c
+libavformat/jpegxl_probe.h
 libavformat/jvdec.c
 libavformat/kvag.c
 libavformat/latmenc.c
@ -2311,6 +2398,8 @@ libavformat/mtaf.c
 libavformat/mtv.c
 libavformat/musx.c
 libavformat/mux.c
+libavformat/mux.h
+libavformat/mux_utils.c
 libavformat/mvdec.c
 libavformat/mvi.c
 libavformat/mxf.c
@ -2373,6 +2462,7 @@ libavformat/rawdec.h
 libavformat/rawenc.c
 libavformat/rawenc.h
 libavformat/rawutils.c
+libavformat/rawutils.h
 libavformat/rawvideodec.c
 libavformat/rdt.c
 libavformat/rdt.h
@ -2551,13 +2641,14 @@ libavformat/url.h
 libavformat/urldecode.c
 libavformat/urldecode.h
 libavformat/utils.c
-libavformat/v210.c
 libavformat/vag.c
 libavformat/vapoursynth.c
 libavformat/vc1dec.c
 libavformat/vc1test.c
 libavformat/vc1testenc.c
+libavformat/version.c
 libavformat/version.h
+libavformat/version_major.h
 libavformat/vividas.c
 libavformat/vivo.c
 libavformat/voc.c
@ -2666,6 +2757,8 @@ libavutil/cpu.h
 libavutil/cpu_internal.h
 libavutil/crc.c
 libavutil/crc.h
+libavutil/csp.c
+libavutil/csp.h
 libavutil/cuda_check.h
 libavutil/des.c
 libavutil/des.h
@ -2700,10 +2793,13 @@ libavutil/float_dsp.c
 libavutil/float_dsp.h
 libavutil/frame.c
 libavutil/frame.h
+libavutil/getenv_utf8.h
 libavutil/hash.c
 libavutil/hash.h
 libavutil/hdr_dynamic_metadata.c
 libavutil/hdr_dynamic_metadata.h
+libavutil/hdr_dynamic_vivid_metadata.c
+libavutil/hdr_dynamic_vivid_metadata.h
 libavutil/hmac.c
 libavutil/hmac.h
 libavutil/hwcontext.c
@ -2839,7 +2935,11 @@ libavutil/tx_int32.c
 libavutil/tx_priv.h
 libavutil/tx_template.c
 libavutil/utils.c
+libavutil/uuid.c
+libavutil/uuid.h
+libavutil/version.c
 libavutil/version.h
+libavutil/version_major.h
 libavutil/video_enc_params.c
 libavutil/video_enc_params.h
 libavutil/vulkan.c
@ -2885,7 +2985,9 @@ libpostproc/postprocess.h
 libpostproc/postprocess_altivec_template.c
 libpostproc/postprocess_internal.h
 libpostproc/postprocess_template.c
+libpostproc/version.c
 libpostproc/version.h
+libpostproc/version_major.h
 libswresample/Makefile
 libswresample/aarch64/Makefile
 libswresample/aarch64/audio_convert_init.c
@ -2916,7 +3018,9 @@ libswresample/swresample.c
 libswresample/swresample.h
 libswresample/swresample_frame.c
 libswresample/swresample_internal.h
+libswresample/version.c
 libswresample/version.h
+libswresample/version_major.h
 libswresample/x86/Makefile
 libswresample/x86/audio_convert.asm
 libswresample/x86/audio_convert_init.c
@ -2967,7 +3071,9 @@ libswscale/swscale.h
 libswscale/swscale_internal.h
 libswscale/swscale_unscaled.c
 libswscale/utils.c
+libswscale/version.c
 libswscale/version.h
+libswscale/version_major.h
 libswscale/vscale.c
 libswscale/x86/Makefile
 libswscale/x86/hscale_fast_bilinear_simd.c
@ -3020,6 +3126,7 @@ tests/fate/dfa.mak
 tests/fate/dnn.mak
 tests/fate/dnxhd.mak
 tests/fate/dpcm.mak
+tests/fate/dvvideo.mak
 tests/fate/ea.mak
 tests/fate/exif.mak
 tests/fate/ffmpeg.mak
@ -3040,6 +3147,7 @@ tests/fate/hlsenc.mak
 tests/fate/hw.mak
 tests/fate/id3v2.mak
 tests/fate/image.mak
+tests/fate/imf.mak
 tests/fate/indeo.mak
 tests/fate/lavf-audio.mak
 tests/fate/lavf-container.mak
@ -3082,6 +3190,7 @@ tests/fate/speedhq.mak
 tests/fate/subtitles.mak
 tests/fate/truehd.mak
 tests/fate/utvideo.mak
+tests/fate/vbn.mak
 tests/fate/vcodec.mak
 tests/fate/video.mak
 tests/fate/voice.mak
@ -3089,6 +3198,7 @@ tests/fate/vorbis.mak
 tests/fate/vpx.mak
 tests/fate/vqf.mak
 tests/fate/wavpack.mak
+tests/fate/webm-dash-manifest.mak
 tests/fate/wma.mak
 tests/fate/xvid.mak
 tools/Makefile
--- a/ffmpeg_get_dlopen_headers.sh
+++ b/ffmpeg_get_dlopen_headers.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # Script to grab headers from existing packages to support dlopen() codec libraries
-# Requires: bash, coreutils, curl, bsdtar, dnf, dnf-plugins-core, tar
+# Requires: bash, coreutils, curl, bsdtar, dnf, dnf-plugins-core, tar, xz
 # Author: Neal Gompa <ngompa@fedoraproject.org>
 #
 # This program is free software: you can redistribute it and/or modify
--- a/fix-vmaf-model-path.patch
+++ b/fix-vmaf-model-path.patch
@ -1,24 +0,0 @@
-From d87f2ce576ddb0ce8f6ade22b3c66a8b63c90713 Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Thu, 31 Dec 2020 13:08:06 +0000
-Subject: [PATCH] fix vmaf model path
-
---
- libavfilter/vf_libvmaf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
-index 4d49127efc..bd6f4519e8 100644
--- a/libavfilter/vf_libvmaf.c
-+++ b/libavfilter/vf_libvmaf.c
-@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
- #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
- 
- static const AVOption libvmaf_options[] = {
-    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
-+    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.json"}, 0, 1, FLAGS},
-     {"log_path",  "Set the file path to be used to store logs.",                        OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
-     {"log_fmt",  "Set the format of the log (csv, json or xml).",                       OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
-     {"enable_transform",  "Enables transform for computing vmaf.",                      OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
-- 
-2.29.2
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-SHA512 (ffmpeg-free-5.0.1.tar.xz) = 313277c2fb62829606c3434f03392351b7964734bef188f7838f754a383d8ad8b890ddd615aa7360ba2a72755fa54a6b967ff2f5a30da7a5490d31b562028e19
-SHA512 (ffmpeg-5.0.1.tar.xz.asc) = 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad
-SHA512 (ffmpeg-dlopen-headers.tar.xz) = b6f62a96e5b199bb52bf7c9c934c5d194a1486f350513dda68c47439d2653605400228a98e289d3bce8b8c0c2a5d95fde2813e238d2bd17d049887df4a7c947a
+SHA512 (ffmpeg-free-5.1.tar.xz) = 19aa20ac10eea7d6b2b62eb27cb679075929e4fbafdf7d01f432dd86d7ce649f39b412bb9227b50542fe79505544b053550be304e1d3efd33ec2c97e7ce565d3
+SHA512 (ffmpeg-5.1.tar.xz.asc) = 41fe8f4865bcd6829f9e7223d05bd7ad58b15e52969c556f0e218ab562fbe0264b37248ea494cd7ae1c4968d79ad59d7f28a1692a8d0838d0de646818ea9b933
+SHA512 (ffmpeg-dlopen-headers.tar.xz) = 3f0c66bea4c9b5135cf1a9883ae5ee433509bad6948eea2ea9f7d5e94276c278ef54e29e8e98fd9f16151fcc8fa0355c672b8ca3e2e2d9e32af61206f6cd05e6
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165