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-10-31 22:55:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old)
and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-4"
Sun Oct 31 22:55:21 2021 rev:45 rq:928013 version:4.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2021-09-30 23:43:08.640452111 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.1890/ffmpeg-4.changes 2021-10-31 22:55:22.855686230 +0100
@@ -1,0 +2,12 @@
+Thu Oct 28 15:58:30 UTC 2021 - Bj��rn Lie <bjorn.lie(a)gmail.com>
+
+- Update to version 4.4.1:
+ * Stable bug fix release, mainly codecs and format fixes.
+- Refresh patches with quilt.
+- Drop patches fixed upstream:
+ * ffmpeg-CVE-2021-33815.patch
+ * ffmpeg-CVE-2021-38114.patch
+ * ffmpeg-CVE-2021-38171.patch
+ * ffmpeg-CVE-2020-22037.patch
+
+-------------------------------------------------------------------
Old:
----
ffmpeg-4.4.tar.xz
ffmpeg-4.4.tar.xz.asc
ffmpeg-CVE-2020-22037.patch
ffmpeg-CVE-2021-33815.patch
ffmpeg-CVE-2021-38114.patch
ffmpeg-CVE-2021-38171.patch
New:
----
ffmpeg-4.4.1.tar.xz
ffmpeg-4.4.1.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpeg-4.spec ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:23.883687019 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:23.887687022 +0100
@@ -96,7 +96,7 @@
%define _major_version 4
%define _major_expected 5
Name: ffmpeg-4
-Version: 4.4
+Version: 4.4.1
Release: 0
Summary: Set of libraries for working with various multimedia formats
License: GPL-3.0-or-later
@@ -118,10 +118,6 @@
Patch5: soversion.patch
Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg-4.4-CVE-2020-22046.patch
-Patch10: ffmpeg-CVE-2021-33815.patch
-Patch11: ffmpeg-CVE-2021-38114.patch
-Patch12: ffmpeg-CVE-2021-38171.patch
-Patch13: ffmpeg-CVE-2020-22037.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel
++++++ ffmpeg-4.2-dlopen-fdk_aac.patch ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:23.955687075 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:23.955687075 +0100
@@ -1,7 +1,7 @@
-Index: b/configure
+Index: ffmpeg-4.4.1/configure
===================================================================
---- a/configure
-+++ b/configure
+--- ffmpeg-4.4.1.orig/configure
++++ ffmpeg-4.4.1/configure
@@ -232,6 +232,7 @@ External library support:
--enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
and libraw1394 [no]
@@ -18,7 +18,7 @@
openssl
libtls
"
-@@ -6360,6 +6362,7 @@ enabled libdrm && require_pkg
+@@ -6361,6 +6363,7 @@ enabled libdrm && require_pkg
enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
{ require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
warn "using libfdk without pkg-config"; } }
@@ -26,10 +26,10 @@
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
enabled fontconfig && enable libfontconfig
-Index: b/libavcodec/dlopen.h
+Index: ffmpeg-4.4.1/libavcodec/dlopen.h
===================================================================
--- /dev/null
-+++ b/libavcodec/dlopen.h
++++ ffmpeg-4.4.1/libavcodec/dlopen.h
@@ -0,0 +1,12 @@
+#ifndef LOCALINC_DLOPEN_H
+#define LOCALINC_DLOPEN_H
@@ -43,10 +43,10 @@
+ goto error;
+
+#endif
-Index: b/libavcodec/libfdk-aacdec.c
+Index: ffmpeg-4.4.1/libavcodec/libfdk-aacdec.c
===================================================================
---- a/libavcodec/libfdk-aacdec.c
-+++ b/libavcodec/libfdk-aacdec.c
+--- ffmpeg-4.4.1.orig/libavcodec/libfdk-aacdec.c
++++ ffmpeg-4.4.1/libavcodec/libfdk-aacdec.c
@@ -37,6 +37,54 @@
#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
#endif
@@ -74,7 +74,7 @@
+static int loadLibFdkAac(AVCodecContext *avctx) {
+ void *libfdkaac = NULL;
+ const char *err = NULL;
-+
++
+ libfdkaac = dlopen(FDKAAC_LIB, RTLD_LAZY);
+ if(err = dlerror()) {
+ av_log(avctx, AV_LOG_FATAL, "%s\n%s is missing, libfdk-aac support will be disabled\n", err, FDKAAC_LIB);
@@ -114,10 +114,10 @@
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-Index: b/libavcodec/libfdk-aacenc.c
+Index: ffmpeg-4.4.1/libavcodec/libfdk-aacenc.c
===================================================================
---- a/libavcodec/libfdk-aacenc.c
-+++ b/libavcodec/libfdk-aacenc.c
+--- ffmpeg-4.4.1.orig/libavcodec/libfdk-aacenc.c
++++ ffmpeg-4.4.1/libavcodec/libfdk-aacenc.c
@@ -35,6 +35,48 @@
#define FDKENC_VER_AT_LEAST(vl0, vl1) 0
#endif
@@ -142,7 +142,7 @@
+static int loadLibFdkAac(AVCodecContext *avctx) {
+ void *libfdkaac = NULL;
+ const char *err = NULL;
-+
++
+ libfdkaac = dlopen(FDKAAC_LIB, RTLD_LAZY);
+ if(err = dlerror()) {
+ av_log(avctx, AV_LOG_FATAL, "%s\n%s is missing, libfdk-aac support will be disabled\n", err, FDKAAC_LIB);
++++++ ffmpeg-4.4-CVE-2020-22046.patch ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:23.963687081 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:23.963687081 +0100
@@ -10,10 +10,10 @@
libavcodec/ac3enc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-Index: b/libavcodec/ac3enc.c
+Index: ffmpeg-4.4.1/libavcodec/ac3enc.c
===================================================================
---- a/libavcodec/ac3enc.c
-+++ b/libavcodec/ac3enc.c
+--- ffmpeg-4.4.1.orig/libavcodec/ac3enc.c
++++ ffmpeg-4.4.1/libavcodec/ac3enc.c
@@ -2148,7 +2148,8 @@ av_cold int ff_ac3_encode_close(AVCodecC
av_freep(&block->cpl_coord_mant);
}
++++++ ffmpeg-4.4.tar.xz -> ffmpeg-4.4.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.4.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg-4.new.1890/ffmpeg-4.4.1.tar.xz differ: char 27, line 1
++++++ ffmpeg-arm6l.diff ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:24.003687111 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:24.007687114 +0100
@@ -2,10 +2,10 @@
libavutil/arm/timer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: ffmpeg-4.4/libavutil/arm/timer.h
+Index: ffmpeg-4.4.1/libavutil/arm/timer.h
===================================================================
---- ffmpeg-4.4.orig/libavutil/arm/timer.h
-+++ ffmpeg-4.4/libavutil/arm/timer.h
+--- ffmpeg-4.4.1.orig/libavutil/arm/timer.h
++++ ffmpeg-4.4.1/libavutil/arm/timer.h
@@ -30,7 +30,7 @@
#define AV_READ_TIME mach_absolute_time
++++++ ffmpeg-codec-choice.diff ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:24.015687120 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:24.015687120 +0100
@@ -11,11 +11,11 @@
libavformat/matroskaenc.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
-Index: b/libavformat/matroskaenc.c
+Index: ffmpeg-4.4.1/libavformat/matroskaenc.c
===================================================================
---- a/libavformat/matroskaenc.c
-+++ b/libavformat/matroskaenc.c
-@@ -2834,16 +2834,24 @@ static const AVClass matroska_class = {
+--- ffmpeg-4.4.1.orig/libavformat/matroskaenc.c
++++ ffmpeg-4.4.1/libavformat/matroskaenc.c
+@@ -2835,16 +2835,24 @@ static const AVClass matroska_class = {
.version = LIBAVUTIL_VERSION_INT,
};
@@ -44,7 +44,7 @@
.init = mkv_init,
.deinit = mkv_deinit,
.write_header = mkv_write_header,
-@@ -2905,8 +2913,7 @@ AVOutputFormat ff_matroska_audio_muxer =
+@@ -2906,8 +2914,7 @@ AVOutputFormat ff_matroska_audio_muxer =
.mime_type = "audio/x-matroska",
.extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext),
++++++ ffmpeg-new-coder-errors.diff ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:24.027687130 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:24.027687130 +0100
@@ -10,11 +10,11 @@
fftools/ffmpeg_opt.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
-Index: ffmpeg-4.4/fftools/ffmpeg.c
+Index: ffmpeg-4.4.1/fftools/ffmpeg.c
===================================================================
---- 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
+--- ffmpeg-4.4.1.orig/fftools/ffmpeg.c
++++ ffmpeg-4.4.1/fftools/ffmpeg.c
+@@ -2954,7 +2954,7 @@ static int init_input_stream(int ist_ind
if (ist->decoding_needed) {
const AVCodec *codec = ist->dec;
if (!codec) {
@@ -23,10 +23,10 @@
avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
return AVERROR(EINVAL);
}
-Index: ffmpeg-4.4/fftools/ffmpeg_filter.c
+Index: ffmpeg-4.4.1/fftools/ffmpeg_filter.c
===================================================================
---- ffmpeg-4.4.orig/fftools/ffmpeg_filter.c
-+++ ffmpeg-4.4/fftools/ffmpeg_filter.c
+--- ffmpeg-4.4.1.orig/fftools/ffmpeg_filter.c
++++ ffmpeg-4.4.1/fftools/ffmpeg_filter.c
@@ -959,7 +959,7 @@ static int configure_input_filter(Filter
{
if (!ifilter->ist->dec) {
@@ -45,10 +45,10 @@
avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index);
ret = AVERROR(EINVAL);
goto fail;
-Index: ffmpeg-4.4/fftools/ffmpeg_opt.c
+Index: ffmpeg-4.4.1/fftools/ffmpeg_opt.c
===================================================================
---- ffmpeg-4.4.orig/fftools/ffmpeg_opt.c
-+++ ffmpeg-4.4/fftools/ffmpeg_opt.c
+--- ffmpeg-4.4.1.orig/fftools/ffmpeg_opt.c
++++ ffmpeg-4.4.1/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 "
++++++ soversion.patch ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:24.035687136 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:24.039687139 +0100
@@ -24,11 +24,11 @@
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: b/configure
+Index: ffmpeg-4.4.1/configure
===================================================================
---- a/configure
-+++ b/configure
-@@ -3833,10 +3833,10 @@ SLIBPREF="lib"
+--- ffmpeg-4.4.1.orig/configure
++++ ffmpeg-4.4.1/configure
+@@ -3834,10 +3834,10 @@ SLIBPREF="lib"
SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
++++++ vmaf-trim-usr-local.patch ++++++
--- /var/tmp/diff_new_pack.Ql2Sxz/_old 2021-10-31 22:55:24.047687145 +0100
+++ /var/tmp/diff_new_pack.Ql2Sxz/_new 2021-10-31 22:55:24.047687145 +0100
@@ -2,10 +2,10 @@
libavfilter/vf_libvmaf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: ffmpeg-4.4/libavfilter/vf_libvmaf.c
+Index: ffmpeg-4.4.1/libavfilter/vf_libvmaf.c
===================================================================
---- ffmpeg-4.4.orig/libavfilter/vf_libvmaf.c
-+++ ffmpeg-4.4/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
