jengelh/ffmpeg-4
SHA256
1
0
Fork 2
forked from pool/ffmpeg-4
Code Pull Requests 1 Activity

- Disable vmaf integration as ffmpeg-4 cannot handle vmaf>=3

Browse Source 
- Delete vmaf-trim-usr-local.patch

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=205
This commit is contained in:
Jan Engelhardt 2023-12-27 12:21:55 +00:00 committed by Git OBS Bridge
parent cd1234d177
commit 7b4240420b
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg-4.changes
View File

@ -2,6 +2,8 @@
Tue Dec 26 13:36:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Tue Dec 26 13:36:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update ffmpeg-glslang-cxx17.patch to build with glslang 14 - 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 <jengelh@inai.de> Wed Dec 6 08:50:00 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

3
ffmpeg-4.spec
View File

@ -119,7 +119,6 @@ Patch2: ffmpeg-new-coder-errors.diff
Patch3: ffmpeg-codec-choice.diff Patch3: ffmpeg-codec-choice.diff
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
Patch5: soversion.patch Patch5: soversion.patch
Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-chromium.patch Patch10: ffmpeg-chromium.patch
Patch11: ffmpeg-libglslang-detection.patch Patch11: ffmpeg-libglslang-detection.patch
@ -177,7 +176,6 @@ BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libva) >= 0.35.0
BuildRequires: pkgconfig(libva-drm) BuildRequires: pkgconfig(libva-drm)
BuildRequires: pkgconfig(libva-x11) BuildRequires: pkgconfig(libva-x11)
BuildRequires: pkgconfig(libvmaf) >= 1.3.9
BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libwebp) >= 0.4
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
%if %{with zmq} %if %{with zmq}
@ -697,7 +695,6 @@ LDFLAGS="%_lto_cflags" \
%if %{with vidstab} %if %{with vidstab}
--enable-libvidstab \ --enable-libvidstab \
%endif %endif
--enable-libvmaf \
--enable-libvorbis \ --enable-libvorbis \
--enable-libv4l2 \ --enable-libv4l2 \
--enable-libvpx \ --enable-libvpx \

17
vmaf-trim-usr-local.patch
View File

@ -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},