Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ffmpeg-4 for openSUSE:Factory
checked in at 2021-04-19 21:05:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old)
and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-4"
Mon Apr 19 21:05:46 2021 rev:39 rq:886260 version:4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2021-03-24
16:09:58.735751792 +0100
+++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.12324/ffmpeg-4.changes
2021-04-19 21:06:01.232031277 +0200
@@ -1,0 +2,13 @@
+Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt <jeng...@inai.de>
+
+- Enable libdavd1 on Leap 15.2+ [boo#1184830]
+
+-------------------------------------------------------------------
+Fri Apr 9 18:52:46 UTC 2021 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 4.4
+ * New demuxers, AV1 support improvements, and other enhancements.
+ * AV1 monochrome encoding support.
+- Remove ffmpeg_altivec_yuv2rgb_novsx.patch (merged)
+
+-------------------------------------------------------------------
Old:
----
ffmpeg-4.3.2.tar.xz
ffmpeg-4.3.2.tar.xz.asc
ffmpeg_altivec_yuv2rgb_novsx.patch
New:
----
ffmpeg-4.4.tar.xz
ffmpeg-4.4.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpeg-4.spec ++++++
--- /var/tmp/diff_new_pack.ugxxYg/_old 2021-04-19 21:06:01.956032362 +0200
+++ /var/tmp/diff_new_pack.ugxxYg/_new 2021-04-19 21:06:01.960032368 +0200
@@ -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 @@
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
@@ -133,7 +132,7 @@
%if %{with codec2}
BuildRequires: pkgconfig(codec2)
%endif
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
BuildRequires: pkgconfig(dav1d)
%endif
BuildRequires: pkgconfig(enca)
@@ -244,15 +243,15 @@
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 @@
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 @@
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 @@
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-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 @@
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-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 @@
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 @@
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 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
@@ -628,7 +627,7 @@
%if %{with codec2}
--enable-libcodec2 \
%endif
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
--enable-libdav1d \
%endif
--enable-libdc1394 \
@@ -761,24 +760,24 @@
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 @@
%_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/
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.ugxxYg/_old 2021-04-19 21:06:01.992032417 +0200
+++ /var/tmp/diff_new_pack.ugxxYg/_new 2021-04-19 21:06:01.992032417 +0200
@@ -1,11 +1,11 @@
-libavcodec58_91
-libavdevice58_10
-libavfilter7_85
-libavformat58_45
+libavcodec58_134
+libavdevice58_13
+libavfilter7_110
+libavformat58_76
libavresample4_0
obsoletes "libavresample4-<targettype> < <version>"
provides "libavresample4-<targettype> = <version>"
-libavutil56_51
-libpostproc55_7
-libswresample3_7
-libswscale5_7
+libavutil56_70
+libpostproc55_9
+libswresample3_9
+libswscale5_9
++++++ ffmpeg-4.3.2.tar.xz -> ffmpeg-4.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.3.2.tar.xz
/work/SRC/openSUSE:Factory/.ffmpeg-4.new.12324/ffmpeg-4.4.tar.xz differ: char
26, line 1
++++++ ffmpeg-arm6l.diff ++++++
--- /var/tmp/diff_new_pack.ugxxYg/_old 2021-04-19 21:06:02.072032536 +0200
+++ /var/tmp/diff_new_pack.ugxxYg/_new 2021-04-19 21:06:02.072032536 +0200
@@ -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 <stdint.h>
- #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
++++++ ffmpeg-new-coder-errors.diff ++++++
--- /var/tmp/diff_new_pack.ugxxYg/_old 2021-04-19 21:06:02.080032548 +0200
+++ /var/tmp/diff_new_pack.ugxxYg/_new 2021-04-19 21:06:02.080032548 +0200
@@ -10,24 +10,24 @@
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 @@
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 @@
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 "
++++++ vmaf-trim-usr-local.patch ++++++
--- /var/tmp/diff_new_pack.ugxxYg/_old 2021-04-19 21:06:02.092032566 +0200
+++ /var/tmp/diff_new_pack.ugxxYg/_new 2021-04-19 21:06:02.092032566 +0200
@@ -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 @@
- {"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},
