- Update to release 4.3

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

929e5159bc13da374b83f5627879c607acce180b.patch

@@ -1,32 +0,0 @@
-From 929e5159bc13da374b83f5627879c607acce180b Mon Sep 17 00:00:00 2001
-From: Gilles Bouthenot <misc@atomas.com>
-Date: Wed, 8 Jan 2020 19:47:55 +0100
-Subject: [PATCH] avformat/id3v2enc: fix bad ID3v2 tag length
-
----
- libavformat/id3v2enc.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: ffmpeg-4.2.1/libavformat/id3v2enc.c
-===================================================================
---- ffmpeg-4.2.1.orig/libavformat/id3v2enc.c
-+++ ffmpeg-4.2.1/libavformat/id3v2enc.c
-@@ -268,15 +268,15 @@ static int write_ctoc(AVFormatContext *s
-     if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0)
-         goto fail;
- 
--    id3->len += avio_put_str(dyn_bc, "toc");
-+    avio_put_str(dyn_bc, "toc");
-     avio_w8(dyn_bc, 0x03);
-     avio_w8(dyn_bc, s->nb_chapters);
-     for (int i = 0; i < s->nb_chapters; i++) {
-         snprintf(name, 122, "ch%d", i);
--        id3->len += avio_put_str(dyn_bc, name);
-+        avio_put_str(dyn_bc, name);
-     }
-     len = avio_close_dyn_buf(dyn_bc, &dyn_buf);
--    id3->len += 16 + ID3v2_HEADER_SIZE;
-+    id3->len += len + ID3v2_HEADER_SIZE;
- 
-     avio_wb32(s->pb, MKBETAG('C', 'T', 'O', 'C'));
-     avio_wb32(s->pb, len);

ffmpeg-4.2.3.tar.xz

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

ffmpeg-4.2.3.tar.xz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABCAAGBQJexrUWAAoJELQyLwTWdljYzyUIAKCrYZuodL55ImESh1AQsoGc
-Ju/is8LniYbxakom+fQCiEhg/TpVkaOVssawGexeIaJ+idauS+W2NGMsBVLB4dGg
-YhZJfUmYkapXAU4KTlUO62JDazOGqFgMtyTCtVnvo6mF5hwcJsELykQs1fj1ao38
-5LEuW7n1rwB57P6y2wJYScKtQVJjsEONv6a2wHdzSxN461SFNzlPPTowAzDR3Dyu
-KPV0n6OEfAinC5ZyzT/P6r733F/JChKbiMrkJmesR1wt/ZLI2MtItQxJX3ylx8B8
-Z0UsJLcFgoQVSJbWMneMizjrYeBLRjHtRZwQlKj51vlc6kr9UCD3wh/SMoIoc5A=
-=OK3T
------END PGP SIGNATURE-----

ffmpeg-4.3.tar.xz

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

ffmpeg-4.3.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAl7nxeAYHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYJecH/3uHwKTAMgNjUAbNE1uF/Vw7
+aoVaQrNP2faDLheLtmQ0YePDeO2jUhSUmbWylvzN2GFw1CxAXpo0LL2VjdP/JSWv
+OFBxz5zjsehJNLIBvrp0yoAroQY/V5UExfsrggfr3Va0vnC/Sa3h0Kekg5Z4JHaY
+7axHaQMy77a8VSr7fJjb9EWwiNKJgpJeBN/jcZ/Go8nWawIqFYOkzWA3BLwWkrNF
+EH7Fpb0Al7C0mvNlYImFdWWzvlfQ0FJi/1+brrh8UIfOvFJu/eW5vhGEVYb3q0hR
+/bmzcXCVQYym6qfVB/7EEijfezMBiFm8ax1+xaOEaY8cJAkjbFTfAHZod3Re6dU=
+=1Fy2
+-----END PGP SIGNATURE-----

ffmpeg-4.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Jun 17 16:32:04 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.3
+  * A plethora of new video filters
+  * Intel QSV-accelerated VP9 decoding
+  * VDPAU VP9 hwaccel
+  * QSV-accelerated VP9 encoding
+  * AV1 frame merge bitstream filter
+  * AV1 Annex B demuxer
+  * Expanded styling support for 3GPP Timed Text Subtitles
+  * Support for muxing PCM and PGS in M2TS
+- Drop ffmpeg-prefer-dav1d-for-playback.patch
+  (solved differently)
+- Drop ffmpeg4_swscale_replace_illegal_vector_keyword.patch,
+  ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch,
+  929e5159bc13da374b83f5627879c607acce180b.patch
+  (merged)
+
 -------------------------------------------------------------------
 Fri Jun  5 16:21:42 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 

ffmpeg-4.spec

@@ -92,7 +92,7 @@
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.2.3
+Version:        4.3
 Release:        0
 Summary:        Library for working with various multimedia formats
 License:        GPL-3.0-or-later
@@ -107,17 +107,10 @@ Source3:        ffmpeg-4-rpmlintrc
 Source4:        enable_decoders
 Source5:        enable_encoders
 Source99:       baselibs.conf
-Patch2:         ffmpeg-arm6l.diff
+Patch1:         ffmpeg-arm6l.diff
-Patch3:         ffmpeg-new-coder-errors.diff
+Patch2:         ffmpeg-new-coder-errors.diff
-Patch4:         ffmpeg-codec-choice.diff
+Patch3:         ffmpeg-codec-choice.diff
-Patch5:         ffmpeg-prefer-dav1d-for-playback.patch
+Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
-Patch6:         ffmpeg-4.2-dlopen-fdk_aac.patch
-# pending review upstream ML and issue#7861
-# http://ffmpeg.org/pipermail/ffmpeg-devel/2019-August/247759.html
-# https://trac.ffmpeg.org/ticket/7861
-Patch7:         ffmpeg4_swscale_replace_illegal_vector_keyword.patch
-Patch8:         ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
-Patch9:         929e5159bc13da374b83f5627879c607acce180b.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
@@ -205,7 +198,7 @@ BuildRequires:  pkgconfig(xcb-shm)
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%if 0%{?suse_version} >= 1550 || 0%{?sleX_version} >= 150200
 %ifarch x86_64
 BuildRequires:  pkgconfig(libmfx)
 %endif
@@ -682,7 +675,7 @@ LDFLAGS="%_lto_cflags" \
 %if %{with lv2}
 	--enable-lv2 \
 %endif
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%if 0%{?suse_version} >= 1550 || 0%{?sleX_version} >= 150200
 %ifarch x86_64
 	--enable-libmfx \
 %endif

ffmpeg-codec-choice.diff

@@ -11,11 +11,11 @@ reduced codec selection list.
  libavformat/matroskaenc.c |   19 +++++++++++++------
  1 file changed, 13 insertions(+), 6 deletions(-)
 
-Index: ffmpeg-4.2/libavformat/matroskaenc.c
+Index: ffmpeg-4.3/libavformat/matroskaenc.c
 ===================================================================
---- ffmpeg-4.2.orig/libavformat/matroskaenc.c
+--- ffmpeg-4.3.orig/libavformat/matroskaenc.c
-+++ ffmpeg-4.2/libavformat/matroskaenc.c
++++ ffmpeg-4.3/libavformat/matroskaenc.c
-@@ -2798,16 +2798,24 @@ static const AVClass matroska_class = {
+@@ -2805,16 +2805,24 @@ static const AVClass matroska_class = {
      .version    = LIBAVUTIL_VERSION_INT,
  };
  
@@ -42,9 +42,9 @@ Index: ffmpeg-4.2/libavformat/matroskaenc.c
 +	CONFIG_MPEG4_ENCODER ? AV_CODEC_ID_MPEG4 : \
 +	AV_CODEC_ID_THEORA,
      .init              = mkv_init,
+     .deinit            = mkv_deinit,
      .write_header      = mkv_write_header,
-     .write_packet      = mkv_write_flush_packet,
+@@ -2876,8 +2884,7 @@ AVOutputFormat ff_matroska_audio_muxer =
-@@ -2867,8 +2875,7 @@ AVOutputFormat ff_matroska_audio_muxer =
      .mime_type         = "audio/x-matroska",
      .extensions        = "mka",
      .priv_data_size    = sizeof(MatroskaMuxContext),
@@ -53,4 +53,4 @@ Index: ffmpeg-4.2/libavformat/matroskaenc.c
 +    .audio_codec       = PREFAUDIO,
      .video_codec       = AV_CODEC_ID_NONE,
      .init              = mkv_init,
-     .write_header      = mkv_write_header,
+     .deinit            = mkv_deinit,

ffmpeg-prefer-dav1d-for-playback.patch

@@ -1,23 +0,0 @@
-16Jun2020/22:55 < zaitor:#opensuse-factory> fyi, when you or someone else bumps
-ffmpeg to 4.3 release, the prefer-dav1d.patch should be dropped, upstream
-solved it in a more elegant way than that patch
-
-Index: ffmpeg-4.2.1/libavcodec/allcodecs.c
-===================================================================
---- ffmpeg-4.2.1.orig/libavcodec/allcodecs.c
-+++ ffmpeg-4.2.1/libavcodec/allcodecs.c
-@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
- extern AVCodec ff_pcm_mulaw_at_decoder;
- extern AVCodec ff_qdmc_at_decoder;
- extern AVCodec ff_qdm2_at_decoder;
-+extern AVCodec ff_libdav1d_decoder;
- extern AVCodec ff_libaom_av1_decoder;
- extern AVCodec ff_libaom_av1_encoder;
- extern AVCodec ff_libaribb24_decoder;
- extern AVCodec ff_libcelt_decoder;
- extern AVCodec ff_libcodec2_encoder;
- extern AVCodec ff_libcodec2_decoder;
--extern AVCodec ff_libdav1d_decoder;
- extern AVCodec ff_libdavs2_decoder;
- extern AVCodec ff_libfdk_aac_encoder;
- extern AVCodec ff_libfdk_aac_decoder;

ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch

@@ -1,50 +0,0 @@
-From daniel at octaforge.org  Tue Aug  6 18:55:37 2019
-From: daniel at octaforge.org (Daniel Kolesa)
-Date: Tue,  6 Aug 2019 17:55:37 +0200
-Subject: [FFmpeg-devel] [PATCH 2/2] swscale: Fix AltiVec/VSX build with
-	recent GCC
-In-Reply-To: <20190806155537.25535-1-daniel@octaforge.org>
-References: <20190806155537.25535-1-daniel@octaforge.org>
-Message-ID: <20190806155537.25535-3-daniel@octaforge.org>
-
-The argument to vec_splat_u16 must be a literal. By making the
-function always inline and marking the arguments const, gcc can
-turn those into literals, and avoid build errors like:
-
-swscale_vsx.c:165:53: error: argument 1 must be a 5-bit signed literal
-
-Signed-off-by: Daniel Kolesa <daniel at octaforge.org>
----
- libswscale/ppc/swscale_vsx.c |   12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-Index: ffmpeg-4.2/libswscale/ppc/swscale_vsx.c
-===================================================================
---- ffmpeg-4.2.orig/libswscale/ppc/swscale_vsx.c
-+++ ffmpeg-4.2/libswscale/ppc/swscale_vsx.c
-@@ -154,8 +154,10 @@ static void yuv2plane1_nbps_u(const int1
-     }
- }
- 
--static void yuv2plane1_nbps_vsx(const int16_t *src, uint16_t *dest, int dstW,
--                           int big_endian, int output_bits)
-+static av_always_inline void yuv2plane1_nbps_vsx(const int16_t *src,
-+                                                 uint16_t *dest, int dstW,
-+                                                 const int big_endian,
-+                                                 const int output_bits)
- {
-     const int dst_u = -(uintptr_t)dest & 7;
-     const int shift = 15 - output_bits;
-@@ -273,8 +275,10 @@ static void yuv2plane1_16_u(const int32_
-     }
- }
- 
--static void yuv2plane1_16_vsx(const int32_t *src, uint16_t *dest, int dstW,
--                           int big_endian, int output_bits)
-+static av_always_inline void yuv2plane1_16_vsx(const int32_t *src,
-+                                               uint16_t *dest, int dstW,
-+                                               const int big_endian,
-+                                               int output_bits)
- {
-     const int dst_u = -(uintptr_t)dest & 7;
-     const int shift = 3;