Accepting request 732014 from home:iznogood:branches:multimedia:libs

- Update to version 4.2.1:
  * Stable bug fix release, mainly codecs and format fixes.
- Drop upstream fixed patch:
  0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch

OBS-URL: https://build.opensuse.org/request/show/732014
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=93

0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch

@@ -1,49 +0,0 @@
-From af70bfbeadc0c9b9215cf045ff2a6a31e8ac3a71 Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Mon, 26 Aug 2019 00:54:20 -0300
-Subject: [PATCH] avcodec/h2645_parse: zero initialize the rbsp buffer
-
-Fixes ticket #8093
-
-Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/h2645_parse.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
-index 24658b3dfa..307e8643e6 100644
---- a/libavcodec/h2645_parse.c
-+++ b/libavcodec/h2645_parse.c
-@@ -345,13 +345,18 @@ static int find_next_start_code(const uint8_t *buf, const uint8_t *next_avc)
- 
- static void alloc_rbsp_buffer(H2645RBSP *rbsp, unsigned int size, int use_ref)
- {
-+    int min_size = size;
-+
-     if (size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
-         goto fail;
-     size += AV_INPUT_BUFFER_PADDING_SIZE;
- 
-     if (rbsp->rbsp_buffer_alloc_size >= size &&
--        (!rbsp->rbsp_buffer_ref || av_buffer_is_writable(rbsp->rbsp_buffer_ref)))
-+        (!rbsp->rbsp_buffer_ref || av_buffer_is_writable(rbsp->rbsp_buffer_ref))) {
-+        av_assert0(rbsp->rbsp_buffer);
-+        memset(rbsp->rbsp_buffer + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-         return;
-+    }
- 
-     size = FFMIN(size + size / 16 + 32, INT_MAX);
- 
-@@ -360,7 +365,7 @@ static void alloc_rbsp_buffer(H2645RBSP *rbsp, unsigned int size, int use_ref)
-     else
-         av_free(rbsp->rbsp_buffer);
- 
--    rbsp->rbsp_buffer = av_malloc(size);
-+    rbsp->rbsp_buffer = av_mallocz(size);
-     if (!rbsp->rbsp_buffer)
-         goto fail;
-     rbsp->rbsp_buffer_alloc_size = size;
--- 
-2.23.0
-

ffmpeg-4.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
+size 9090632

ffmpeg-4.2.1.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJdctw9AAoJELQyLwTWdljYeg0H/3agc6Pk8PM7OlE3WVVfiSCt
+1gHk6wmCzdvrpQhX7u0RP/O1i2mkSlX+ERlkBTssPN2NnvTJbBkg7oQDrRhIxo6E
+FshW6wD+iJ91UL8suEC9fpBOfApG+Ef1JK5VPxKROcHH05Ni4yhae2vG1YQXoRDL
+9SU0lQaXQd4L1D3O/sPipXl/iJhZONrq/npsL8/9xgxLQ6ziZw4GzIirfa0zLkYE
+CiH0+9HTJk+9mdyCS9qDiHbzHrpWYfkc7d6/qOp+BhU6rNEGi30JTlhUHYpJL59y
+7EnCDv5JFGLO4/a3hq6KtZw/ni4wTFKkyvF26kVSRkgI+7gUOo8mCifXRfgmpco=
+=5hOA
+-----END PGP SIGNATURE-----

ffmpeg-4.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5
-size 9088756

ffmpeg-4.2.tar.xz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJdSJwGAAoJELQyLwTWdljYHXsIAJ5pXCQtJTZGBWDnIAqEiuJl
-tk9UIFhptnHkQzAXLy1BxDa76MkI0MV9zvy5rl6BPyfWNhUPcvtgptQFTMLiCiub
-FdIHwsTEgjRX1YqD8zwS4zsULXxGzXj3uR15zr5eJKueEjpq1NJtujUY88CkHGx3
-hjR8y6oGxCM/SMNctD1HCZNoT2E3g3/wyW+M6+OcYAkRSI8Igf6XTFqvQHefQoUW
-D227cAqJ1a9Ld1EwG30rZct4V22Wo4dUcfgNWU5eLu4xDaYiIeqRnsgqVH2kutXU
-94vAFNLqj67D1atMzOyVRJf09XIpqeYTzJuOqyDdRLrM5GCO1a+7zEqx3ms+Jfk=
-=3kLA
------END PGP SIGNATURE-----

ffmpeg-4.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 18 20:08:06 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 4.2.1:
+  * Stable bug fix release, mainly codecs and format fixes.
+- Drop upstream fixed patch:
+  0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch
+
 -------------------------------------------------------------------
 Tue Sep 10 08:30:36 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

ffmpeg-4.spec

@@ -97,7 +97,7 @@
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.2
+Version:        4.2.1
 Release:        0
 Summary:        Library for working with various multimedia formats
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -122,7 +122,6 @@ Patch6:         ffmpeg-4.2-dlopen-fdk_aac.patch
 # https://trac.ffmpeg.org/ticket/7861
 Patch7:         ffmpeg4_swscale_replace_illegal_vector_keyword.patch
 Patch8:         ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
-Patch9:         0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel