diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 00516a7..fb7d11c 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -2,6 +2,8 @@ Tue Dec 26 13:36:38 UTC 2023 - Jan Engelhardt - Update ffmpeg-glslang-cxx17.patch to build with glslang 14 +- Disable vmaf integration as ffmpeg-4 cannot handle vmaf>=3 +- Delete vmaf-trim-usr-local.patch ------------------------------------------------------------------- Wed Dec 6 08:50:00 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index bfa0107..c762634 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -119,7 +119,6 @@ Patch2: ffmpeg-new-coder-errors.diff Patch3: ffmpeg-codec-choice.diff Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch5: soversion.patch -Patch8: vmaf-trim-usr-local.patch Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-libglslang-detection.patch @@ -177,7 +176,6 @@ BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libva-drm) BuildRequires: pkgconfig(libva-x11) -BuildRequires: pkgconfig(libvmaf) >= 1.3.9 BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libxml-2.0) %if %{with zmq} @@ -697,7 +695,6 @@ LDFLAGS="%_lto_cflags" \ %if %{with vidstab} --enable-libvidstab \ %endif - --enable-libvmaf \ --enable-libvorbis \ --enable-libv4l2 \ --enable-libvpx \ diff --git a/vmaf-trim-usr-local.patch b/vmaf-trim-usr-local.patch deleted file mode 100644 index 5e07045..0000000 --- a/vmaf-trim-usr-local.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - libavfilter/vf_libvmaf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ffmpeg-4.4.1/libavfilter/vf_libvmaf.c -=================================================================== ---- ffmpeg-4.4.1.orig/libavfilter/vf_libvmaf.c -+++ ffmpeg-4.4.1/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.pkl"}, 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},