From a4f7aeddee9a49bf8ae8c56548e58d50e57dda0d35b3f616f5ac8b2e9d7d517a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Apr 2021 20:59:58 +0000 Subject: [PATCH] - Update to release 4.4 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=155 --- baselibs.conf | 16 +-- ffmpeg-4.3.2.tar.xz | 3 - ffmpeg-4.3.2.tar.xz.asc | 11 -- ffmpeg-4.4.tar.xz | 3 + ffmpeg-4.4.tar.xz.asc | 11 ++ ffmpeg-4.changes | 8 ++ ffmpeg-4.spec | 169 ++++++++++++++--------------- ffmpeg-arm6l.diff | 16 +-- ffmpeg-new-coder-errors.diff | 28 ++--- ffmpeg_altivec_yuv2rgb_novsx.patch | 30 ----- vmaf-trim-usr-local.patch | 8 +- 11 files changed, 140 insertions(+), 163 deletions(-) delete mode 100644 ffmpeg-4.3.2.tar.xz delete mode 100644 ffmpeg-4.3.2.tar.xz.asc create mode 100644 ffmpeg-4.4.tar.xz create mode 100644 ffmpeg-4.4.tar.xz.asc delete mode 100644 ffmpeg_altivec_yuv2rgb_novsx.patch diff --git a/baselibs.conf b/baselibs.conf index 9e618c7..7d9c2b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,11 +1,11 @@ -libavcodec58_91 -libavdevice58_10 -libavfilter7_85 -libavformat58_45 +libavcodec58_134 +libavdevice58_13 +libavfilter7_110 +libavformat58_76 libavresample4_0 obsoletes "libavresample4- < " provides "libavresample4- = " -libavutil56_51 -libpostproc55_7 -libswresample3_7 -libswscale5_7 +libavutil56_70 +libpostproc55_9 +libswresample3_9 +libswscale5_9 diff --git a/ffmpeg-4.3.2.tar.xz b/ffmpeg-4.3.2.tar.xz deleted file mode 100644 index 099a279..0000000 --- a/ffmpeg-4.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb -size 9391100 diff --git a/ffmpeg-4.3.2.tar.xz.asc b/ffmpeg-4.3.2.tar.xz.asc deleted file mode 100644 index 962182e..0000000 --- a/ffmpeg-4.3.2.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmAxcoMYHGZmbXBlZy1k -ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYO2UH/0Olke14XxdkZycJH4zuh3a0 -1bV+M01fLOtOHXSIdoLtMD0uF5zynsvK9kyk/boXX4vK44XTpNe+dlvTOAiY6VKk -WfGBHG91y6/kYm+0tsan22uxrJTHlO/KP477P/N7dCGA1juzDZ05pMZ+imikXA88 -PwmUYGGiCB6ErFmgn+kJ3WJBR20GMIdCC4E5lOv+7aJJL/zZcPAnU+bU689VutmE -BJ8CV0tBkBvNS0b32+kZQ/Lwjx69k+L9uiwpFXSIUU0Sus9/6QZJMEhvqPDPe7yg -EUqBcC1aYWbDfC2+WeTNHSOXUX4RIpfNIi2qFfoW48tDy0nQzeHOPM0boi+Gmrs= -=FJtn ------END PGP SIGNATURE----- diff --git a/ffmpeg-4.4.tar.xz b/ffmpeg-4.4.tar.xz new file mode 100644 index 0000000..991959e --- /dev/null +++ b/ffmpeg-4.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 +size 9557868 diff --git a/ffmpeg-4.4.tar.xz.asc b/ffmpeg-4.4.tar.xz.asc new file mode 100644 index 0000000..6651478 --- /dev/null +++ b/ffmpeg-4.4.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmBvdggYHGZmbXBlZy1k +ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYfHAH/jlhBNKe+Hs+MEwIma4ydes/ +mn/6UigsxZ2iEkMese8zlDNC9tKJrKn5qDmCr92pq0vIbSytDMJi3hph75NoTiEf +Q27LlyaASR6ghn5h/LZID/SWFHhCKGYyqm9d70hDTFmql+DhKULxV0fILfX6MXAg +YsNYlAHbPCGn3xscJ8QIo6qjUBQM7awNx8ra303Q9Hxa9+nOLg4eGUTD97dOODQo +34Luqy0YSYiZFcIMWa7C1Ng04v9A9J9XqMcz5j3ap5AjU9hOoNPnJ7XJsFFZkKLO +hARXfkXcS3EX85dytARCSoIYU2dF8zL7zIwXAdpIRQZ93BWVuWvqJ3PUhG1Myqo= +=k2do +-----END PGP SIGNATURE----- diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 6b58cc1..a0e036a 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 9 18:52:46 UTC 2021 - Jan Engelhardt + +- Update to release 4.4 + * New demuxers, AV1 support improvements, and other enhancements. + * AV1 monochrome encoding support. +- Remove ffmpeg_altivec_yuv2rgb_novsx.patch (merged) + ------------------------------------------------------------------- Sun Mar 14 21:08:02 UTC 2021 - Dirk Müller diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 670ba15..4aa195f 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -94,7 +94,7 @@ %define _major_version 4 %define _major_expected 5 Name: ffmpeg-4 -Version: 4.3.2 +Version: 4.4 Release: 0 Summary: Library for working with various multimedia formats License: GPL-3.0-or-later @@ -115,7 +115,6 @@ Patch3: ffmpeg-codec-choice.diff Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch5: soversion.patch Patch8: vmaf-trim-usr-local.patch -Patch9: ffmpeg_altivec_yuv2rgb_novsx.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel @@ -244,15 +243,15 @@ Provides: ffmpeg-tools = %version Obsoletes: ffmpeg-tools < %version Provides: ffmpeg = %version Obsoletes: ffmpeg < %version -Requires: libavcodec58_91 = %version-%release -Requires: libavdevice58_10 = %version-%release -Requires: libavfilter7_85 = %version-%release -Requires: libavformat58_45 = %version-%release +Requires: libavcodec58_134 = %version-%release +Requires: libavdevice58_13 = %version-%release +Requires: libavfilter7_110 = %version-%release +Requires: libavformat58_76 = %version-%release Requires: libavresample4_0 = %version-%release -Requires: libavutil56_51 = %version-%release -Requires: libpostproc55_7 = %version-%release -Requires: libswresample3_7 = %version-%release -Requires: libswscale5_7 = %version-%release +Requires: libavutil56_70 = %version-%release +Requires: libpostproc55_9 = %version-%release +Requires: libswresample3_9 = %version-%release +Requires: libswscale5_9 = %version-%release %description FFmpeg is a multimedia framework, able to decode, encode, @@ -263,21 +262,21 @@ that humans and machines have created. This build of ffmpeg is limited in the number of codecs supported. %endif -%package -n libavcodec58_91 +%package -n libavcodec58_134 Summary: FFmpeg codec library Group: System/Libraries -Requires: libavutil56_51 = %version-%release -Requires: libswresample3_7 = %version-%release +Requires: libavutil56_70 = %version-%release +Requires: libswresample3_9 = %version-%release %if 0%{?BUILD_ORIG} Provides: libavcodec-full = %version-%release # This can be (and is) required by packages like vlc-codecs - # do follow the shlib name to not get random lib providers -Provides: libavcodec58_91(unrestricted) +Provides: libavcodec58_134(unrestricted) %endif # For mozillas Provides: libavcodec = %version-%release -%description -n libavcodec58_91 +%description -n libavcodec58_134 The libavcodec library provides a generic encoding/decoding framework and contains multiple decoders and encoders for audio, video and subtitle streams, and several bitstream filters. @@ -293,7 +292,7 @@ Provides: libavcodec-devel = %version-%release Obsoletes: libavcodec-devel < %version-%release Requires: %name-libavresample-devel = %version-%release Requires: %name-libavutil-devel = %version-%release -Requires: libavcodec58_91 = %version-%release +Requires: libavcodec58_134 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -304,15 +303,15 @@ subtitle streams, and several bitstream filters. This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavdevice58_10 +%package -n libavdevice58_13 Summary: FFmpeg device library Group: System/Libraries -Requires: libavcodec58_91 = %version-%release -Requires: libavfilter7_85 = %version-%release -Requires: libavformat58_45 = %version-%release -Requires: libavutil56_51 = %version-%release +Requires: libavcodec58_134 = %version-%release +Requires: libavfilter7_110 = %version-%release +Requires: libavformat58_76 = %version-%release +Requires: libavutil56_70 = %version-%release -%description -n libavdevice58_10 +%description -n libavdevice58_13 The libavdevice library provides a generic framework for grabbing from and rendering to many common multimedia input/output devices, and supports several input and output devices, including Video4Linux2, VfW, @@ -333,7 +332,7 @@ Requires: %name-libavutil-devel = %version-%release Requires: %name-libpostproc-devel = %version-%release Requires: %name-libswresample-devel = %version-%release Requires: %name-libswscale-devel = %version-%release -Requires: libavdevice58_10 = %version-%release +Requires: libavdevice58_13 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -345,18 +344,18 @@ DShow, and ALSA. This subpackage contains the headers for FFmpeg libavcodec. -%package -n libavfilter7_85 +%package -n libavfilter7_110 Summary: FFmpeg audio and video filtering library Group: System/Libraries -Requires: libavcodec58_91 = %version-%release -Requires: libavformat58_45 = %version-%release +Requires: libavcodec58_134 = %version-%release +Requires: libavformat58_76 = %version-%release Requires: libavresample4_0 = %version-%release -Requires: libavutil56_51 = %version-%release -Requires: libpostproc55_7 = %version-%release -Requires: libswresample3_7 = %version-%release -Requires: libswscale5_7 = %version-%release +Requires: libavutil56_70 = %version-%release +Requires: libpostproc55_9 = %version-%release +Requires: libswresample3_9 = %version-%release +Requires: libswscale5_9 = %version-%release -%description -n libavfilter7_85 +%description -n libavfilter7_110 The libavfilter library provides a generic audio/video filtering framework containing several filters, sources and sinks. @@ -372,7 +371,7 @@ Requires: %name-libavutil-devel = %version-%release Requires: %name-libpostproc-devel = %version-%release Requires: %name-libswresample-devel = %version-%release Requires: %name-libswscale-devel = %version-%release -Requires: libavfilter7_85 = %version-%release +Requires: libavfilter7_110 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -382,13 +381,13 @@ framework containing several filters, sources and sinks. This subpackage contains the headers for FFmpeg libavfilter. -%package -n libavformat58_45 +%package -n libavformat58_76 Summary: FFmpeg's stream format library Group: System/Libraries -Requires: libavcodec58_91 = %version-%release -Requires: libavutil56_51 = %version-%release +Requires: libavcodec58_134 = %version-%release +Requires: libavutil56_70 = %version-%release -%description -n libavformat58_45 +%description -n libavformat58_76 The libavformat library provides a generic framework for multiplexing and demultiplexing (muxing and demuxing) audio, video and subtitle streams. It encompasses multiple muxers and demuxers for multimedia @@ -406,7 +405,7 @@ Obsoletes: libavformat-devel < %version-%release Requires: %name-libavcodec-devel = %version-%release Requires: %name-libavutil-devel = %version-%release Requires: %name-libswresample-devel = %version-%release -Requires: libavformat58_45 = %version-%release +Requires: libavformat58_76 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -421,7 +420,7 @@ This subpackage contains the headers for FFmpeg libavformat. %package -n libavresample4_0 Summary: FFmpeg alternate audio resampling library Group: System/Libraries -Requires: libavutil56_51 = %version-%release +Requires: libavutil56_70 = %version-%release Obsoletes: libavresample4 < %version-%release Provides: libavresample4 = %version-%release @@ -449,11 +448,11 @@ It is advised to use libswresample for new code. This subpackage contains the headers for FFmpeg's copy of libavresample. -%package -n libavutil56_51 +%package -n libavutil56_70 Summary: FFmpeg's utility library Group: System/Libraries -%description -n libavutil56_51 +%description -n libavutil56_70 The libavutil library is a utility library to aid portable multimedia programming. It contains safe portable string functions, random number generators, data structures, additional mathematics functions, @@ -465,7 +464,7 @@ Summary: Development files for FFmpeg's utility library Group: Development/Libraries/C and C++ Provides: libavutil-devel = %version-%release Obsoletes: libavutil-devel < %version-%release -Requires: libavutil56_51 = %version-%release +Requires: libavutil56_70 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -478,12 +477,12 @@ for pixel and sample formats). This subpackage contains the headers for FFmpeg libavutil. -%package -n libpostproc55_7 +%package -n libpostproc55_9 Summary: FFmpeg post-processing library Group: System/Libraries -Requires: libavutil56_51 = %version-%release +Requires: libavutil56_70 = %version-%release -%description -n libpostproc55_7 +%description -n libpostproc55_9 A library with video postprocessing filters, such as deblocking and deringing filters, noise reduction, automatic contrast and brightness correction, linear/cubic interpolating deinterlacing. @@ -494,7 +493,7 @@ Group: Development/Libraries/C and C++ Provides: libpostproc-devel = %version-%release Obsoletes: libpostproc-devel < %version-%release Requires: %name-libavutil-devel = %version-%release -Requires: libpostproc55_7 = %version-%release +Requires: libpostproc55_9 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -505,12 +504,12 @@ correction, linear/cubic interpolating deinterlacing. This subpackage contains the headers for FFmpeg libpostproc. -%package -n libswresample3_7 +%package -n libswresample3_9 Summary: FFmpeg software resampling library Group: System/Libraries -Requires: libavutil56_51 = %version-%release +Requires: libavutil56_70 = %version-%release -%description -n libswresample3_7 +%description -n libswresample3_9 The libswresample library performs audio conversion between different sample rates, channel layout and channel formats. @@ -520,7 +519,7 @@ Group: Development/Libraries/C and C++ Provides: libswresample-devel = %version-%release Obsoletes: libswresample-devel < %version-%release Requires: %name-libavutil-devel = %version-%release -Requires: libswresample3_7 = %version-%release +Requires: libswresample3_9 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -530,12 +529,12 @@ sample rates, channel layout and channel formats. This subpackage contains the headers for FFmpeg libswresample. -%package -n libswscale5_7 +%package -n libswscale5_9 Summary: FFmpeg image scaling and colorspace/pixel conversion library Group: System/Libraries -Requires: libavutil56_51 = %version-%release +Requires: libavutil56_70 = %version-%release -%description -n libswscale5_7 +%description -n libswscale5_9 The libswscale library performs image scaling and colorspace and pixel format conversion operations. @@ -545,7 +544,7 @@ Group: Development/Libraries/C and C++ Provides: libswscale-devel = %version-%release Conflicts: libswscale-devel Requires: %name-libavutil-devel = %version-%release -Requires: libswscale5_7 = %version-%release +Requires: libswscale5_9 = %version-%release %devel_conflicts -c < -v %_major_version %devel_conflicts -c >= -v %_major_expected @@ -761,24 +760,24 @@ for i in libavformat/options_table.h libavformat/os_support.h \ cp -a $i "$b/%_includedir/ffmpeg/private/$i" done -%post -n libavcodec58_91 -p /sbin/ldconfig -%postun -n libavcodec58_91 -p /sbin/ldconfig -%post -n libavdevice58_10 -p /sbin/ldconfig -%postun -n libavdevice58_10 -p /sbin/ldconfig -%post -n libavfilter7_85 -p /sbin/ldconfig -%postun -n libavfilter7_85 -p /sbin/ldconfig -%post -n libavformat58_45 -p /sbin/ldconfig -%postun -n libavformat58_45 -p /sbin/ldconfig +%post -n libavcodec58_134 -p /sbin/ldconfig +%postun -n libavcodec58_134 -p /sbin/ldconfig +%post -n libavdevice58_13 -p /sbin/ldconfig +%postun -n libavdevice58_13 -p /sbin/ldconfig +%post -n libavfilter7_110 -p /sbin/ldconfig +%postun -n libavfilter7_110 -p /sbin/ldconfig +%post -n libavformat58_76 -p /sbin/ldconfig +%postun -n libavformat58_76 -p /sbin/ldconfig %post -n libavresample4_0 -p /sbin/ldconfig %postun -n libavresample4_0 -p /sbin/ldconfig -%post -n libavutil56_51 -p /sbin/ldconfig -%postun -n libavutil56_51 -p /sbin/ldconfig -%post -n libpostproc55_7 -p /sbin/ldconfig -%postun -n libpostproc55_7 -p /sbin/ldconfig -%post -n libswresample3_7 -p /sbin/ldconfig -%postun -n libswresample3_7 -p /sbin/ldconfig -%post -n libswscale5_7 -p /sbin/ldconfig -%postun -n libswscale5_7 -p /sbin/ldconfig +%post -n libavutil56_70 -p /sbin/ldconfig +%postun -n libavutil56_70 -p /sbin/ldconfig +%post -n libpostproc55_9 -p /sbin/ldconfig +%postun -n libpostproc55_9 -p /sbin/ldconfig +%post -n libswresample3_9 -p /sbin/ldconfig +%postun -n libswresample3_9 -p /sbin/ldconfig +%post -n libswscale5_9 -p /sbin/ldconfig +%postun -n libswscale5_9 -p /sbin/ldconfig %files %doc Changelog CREDITS README.md @@ -795,41 +794,41 @@ done %_libdir/libswresample.so.3 %_libdir/libswscale.so.5 -%files -n libavcodec58_91 +%files -n libavcodec58_134 %license COPYING.GPLv2 LICENSE.md -%_libdir/libavcodec.so.58.91* +%_libdir/libavcodec.so.58.134* -%files -n libavdevice58_10 +%files -n libavdevice58_13 %license COPYING.GPLv2 LICENSE.md -%_libdir/libavdevice.so.58.10* +%_libdir/libavdevice.so.58.13* -%files -n libavfilter7_85 +%files -n libavfilter7_110 %license COPYING.GPLv2 LICENSE.md -%_libdir/libavfilter.so.7.85* +%_libdir/libavfilter.so.7.110* -%files -n libavformat58_45 +%files -n libavformat58_76 %license COPYING.GPLv2 LICENSE.md -%_libdir/libavformat.so.58.45* +%_libdir/libavformat.so.58.76* %files -n libavresample4_0 %license COPYING.GPLv2 LICENSE.md %_libdir/libavresample.so.4.0* -%files -n libavutil56_51 +%files -n libavutil56_70 %license COPYING.GPLv2 LICENSE.md -%_libdir/libavutil.so.56.51* +%_libdir/libavutil.so.56.70* -%files -n libpostproc55_7 +%files -n libpostproc55_9 %license COPYING.GPLv2 LICENSE.md -%_libdir/libpostproc.so.55.7* +%_libdir/libpostproc.so.55.9* -%files -n libswresample3_7 +%files -n libswresample3_9 %license COPYING.GPLv2 LICENSE.md -%_libdir/libswresample.so.3.7* +%_libdir/libswresample.so.3.9* -%files -n libswscale5_7 +%files -n libswscale5_9 %license COPYING.GPLv2 LICENSE.md -%_libdir/libswscale.so.5.7* +%_libdir/libswscale.so.5.9* %files libavcodec-devel %dir %_includedir/ffmpeg/ diff --git a/ffmpeg-arm6l.diff b/ffmpeg-arm6l.diff index 0d6a395..d49ac2f 100644 --- a/ffmpeg-arm6l.diff +++ b/ffmpeg-arm6l.diff @@ -2,16 +2,16 @@ libavutil/arm/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: ffmpeg-4.1.3/libavutil/arm/timer.h +Index: ffmpeg-4.4/libavutil/arm/timer.h =================================================================== ---- ffmpeg-4.1.3.orig/libavutil/arm/timer.h -+++ ffmpeg-4.1.3/libavutil/arm/timer.h -@@ -24,7 +24,7 @@ - #include - #include "config.h" +--- ffmpeg-4.4.orig/libavutil/arm/timer.h ++++ ffmpeg-4.4/libavutil/arm/timer.h +@@ -30,7 +30,7 @@ --#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) -+#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6ZK__) + #define AV_READ_TIME mach_absolute_time + +-#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) ++#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6ZK__) #define AV_READ_TIME read_time diff --git a/ffmpeg-new-coder-errors.diff b/ffmpeg-new-coder-errors.diff index 9d6039a..2171686 100644 --- a/ffmpeg-new-coder-errors.diff +++ b/ffmpeg-new-coder-errors.diff @@ -10,24 +10,24 @@ Improve the error messages a bit to say what's really going on fftools/ffmpeg_opt.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -Index: ffmpeg-4.2/fftools/ffmpeg.c +Index: ffmpeg-4.4/fftools/ffmpeg.c =================================================================== ---- ffmpeg-4.2.orig/fftools/ffmpeg.c -+++ ffmpeg-4.2/fftools/ffmpeg.c -@@ -2898,7 +2898,7 @@ static int init_input_stream(int ist_ind +--- ffmpeg-4.4.orig/fftools/ffmpeg.c ++++ ffmpeg-4.4/fftools/ffmpeg.c +@@ -2951,7 +2951,7 @@ static int init_input_stream(int ist_ind if (ist->decoding_needed) { - AVCodec *codec = ist->dec; + const AVCodec *codec = ist->dec; if (!codec) { - snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d", + snprintf(error, error_len, "This build of ffmpeg does not include a \"%s\" decoder needed for input stream #%d:%d.", avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index); return AVERROR(EINVAL); } -Index: ffmpeg-4.2/fftools/ffmpeg_filter.c +Index: ffmpeg-4.4/fftools/ffmpeg_filter.c =================================================================== ---- ffmpeg-4.2.orig/fftools/ffmpeg_filter.c -+++ ffmpeg-4.2/fftools/ffmpeg_filter.c -@@ -981,7 +981,7 @@ static int configure_input_filter(Filter +--- ffmpeg-4.4.orig/fftools/ffmpeg_filter.c ++++ ffmpeg-4.4/fftools/ffmpeg_filter.c +@@ -959,7 +959,7 @@ static int configure_input_filter(Filter { if (!ifilter->ist->dec) { av_log(NULL, AV_LOG_ERROR, @@ -36,7 +36,7 @@ Index: ffmpeg-4.2/fftools/ffmpeg_filter.c ifilter->ist->file_index, ifilter->ist->st->index); return AVERROR_DECODER_NOT_FOUND; } -@@ -1131,7 +1131,7 @@ int configure_filtergraph(FilterGraph *f +@@ -1103,7 +1103,7 @@ int configure_filtergraph(FilterGraph *f if (!ost->enc) { /* identical to the same check in ffmpeg.c, needed because complex filter graphs are initialized earlier */ @@ -45,11 +45,11 @@ Index: ffmpeg-4.2/fftools/ffmpeg_filter.c avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index); ret = AVERROR(EINVAL); goto fail; -Index: ffmpeg-4.2/fftools/ffmpeg_opt.c +Index: ffmpeg-4.4/fftools/ffmpeg_opt.c =================================================================== ---- ffmpeg-4.2.orig/fftools/ffmpeg_opt.c -+++ ffmpeg-4.2/fftools/ffmpeg_opt.c -@@ -1327,7 +1327,7 @@ static int choose_encoder(OptionsContext +--- ffmpeg-4.4.orig/fftools/ffmpeg_opt.c ++++ ffmpeg-4.4/fftools/ffmpeg_opt.c +@@ -1400,7 +1400,7 @@ static int choose_encoder(OptionsContext if (!ost->enc) { av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for " "output stream #%d:%d. Default encoder for format %s (codec %s) is " diff --git a/ffmpeg_altivec_yuv2rgb_novsx.patch b/ffmpeg_altivec_yuv2rgb_novsx.patch deleted file mode 100644 index 0fffdc7..0000000 --- a/ffmpeg_altivec_yuv2rgb_novsx.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Michel Normand -Subject: ffmpeg altivec yuv2rgb novsx -Date: Fri, 27 Nov 2020 15:56:55 +0100 - -ffmpeg altivec yuv2rgb novsx - -Retrieved from -https://trac.ffmpeg.org/ticket/8750#comment:7 - -diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c -index 536545293d..930ef6b98f 100644 ---- a/libswscale/ppc/yuv2rgb_altivec.c -+++ b/libswscale/ppc/yuv2rgb_altivec.c -@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y, - * ------------------------------------------------------------------------------ - */ - -+#if !HAVE_VSX -+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr) -+{ -+ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset); -+ vector unsigned char align_perm = vec_lvsl(offset, addr); -+ -+ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm); -+} -+#endif /* !HAVE_VSX */ -+ - #define DEFCSP420_CVT(name, out_pixels) \ - static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ - int *instrides, int srcSliceY, int srcSliceH, \ diff --git a/vmaf-trim-usr-local.patch b/vmaf-trim-usr-local.patch index 9a27b93..207c6eb 100644 --- a/vmaf-trim-usr-local.patch +++ b/vmaf-trim-usr-local.patch @@ -2,10 +2,10 @@ libavfilter/vf_libvmaf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: ffmpeg-4.3.1/libavfilter/vf_libvmaf.c +Index: ffmpeg-4.4/libavfilter/vf_libvmaf.c =================================================================== ---- ffmpeg-4.3.1.orig/libavfilter/vf_libvmaf.c -+++ ffmpeg-4.3.1/libavfilter/vf_libvmaf.c +--- ffmpeg-4.4.orig/libavfilter/vf_libvmaf.c ++++ ffmpeg-4.4/libavfilter/vf_libvmaf.c @@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM @@ -13,5 +13,5 @@ Index: ffmpeg-4.3.1/libavfilter/vf_libvmaf.c - {"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 (xml or json).", OFFSET(log_fmt), 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},