Update to 4.2 release

4361293fcf59edb56879c36edcd25f0a91e0edf8.patch

@@ -1,32 +0,0 @@
-From 4361293fcf59edb56879c36edcd25f0a91e0edf8 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sat, 24 Nov 2018 13:02:02 -0800
-Subject: [PATCH 1/1] avutil/mem: Fix invalid use of av_alloc_size
-
-The alloc_size attribute is valid only on functions that return a
-pointer.  GCC 9 (not yet released) warns about invalid usage:
-
-./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes]
-  342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-      | ^~~~~~~~~~~~~
-
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavutil/mem.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavutil/mem.h b/libavutil/mem.h
-index 55ae573..5fb1a02 100644
---- a/libavutil/mem.h
-+++ b/libavutil/mem.h
-@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
-  * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-  *          correctly aligned.
-  */
--av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
- 
- /**
-  * Reallocate the given buffer if it is not large enough, otherwise do nothing.
--- 
-2.7.4

ffmpeg.spec

@@ -9,6 +9,7 @@
 
 %if 0%{?el7}
 %global _without_aom      1
+%global _without_dav1d      1
 %global _without_frei0r   1
 %global _without_mfx      1
 %global _without_opus     1
@@ -17,6 +18,7 @@
 
 %if 0%{?el8}
 %global _without_aom      1
+%global _without_dav1d      1
 %global _without_mfx      1
 %endif
 
@@ -86,8 +88,8 @@ ExclusiveArch: armv7hnl
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg%{?flavor}
-Version:        4.1.4
+Version:        4.2
-Release:        2%{?date}%{?date:git}%{?rel}%{?dist}
+Release:        1%{?date}%{?date:git}%{?rel}%{?dist}
 License:        %{ffmpeg_license}
 URL:            http://ffmpeg.org/
 %if 0%{?date}
@@ -95,9 +97,6 @@ Source0:        ffmpeg-%{?branch}%{date}.tar.bz2
 %else
 Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
 %endif
-#Backport avutil/mem: Fix invalid use of av_alloc_size
-#See rfbz#5221
-Patch0:         4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
 #http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2019-July/246927.html
 Patch1:         Use-gnutls_set_default_priority.patch
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -119,6 +118,7 @@ BuildRequires:  lame-devel >= 3.98.3
 %{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{!?_without_ladspa:BuildRequires: ladspa-devel}
 %{!?_without_aom:BuildRequires:  libaom-devel}
+%{!?_without_dav1d:BuildRequires:  libdav1d-devel}
 BuildRequires:  libass-devel
 BuildRequires:  libbluray-devel
 %{?_with_bs2b:BuildRequires: libbs2b-devel}
@@ -251,6 +251,7 @@ This package contains development files for %{name}
     --enable-gnutls \\\
     %{!?_without_ladspa:--enable-ladspa} \\\
     %{!?_without_aom:--enable-libaom} \\\
+    %{!?_without_dav1d:--enable-libdav1d} \\\
     --enable-libass \\\
     --enable-libbluray \\\
     %{?_with_bs2b:--enable-libbs2b} \\\
@@ -323,7 +324,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
 %else
 %setup -q -n ffmpeg-%{version}
 %endif
-%patch0 -p1
 # fix -O3 -g in host_cflags
 sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
 mkdir -p _doc/examples
@@ -430,6 +430,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
 
 
 %changelog
+* Mon Aug 05 2019 Leigh Scott <leigh123linux@googlemail.com> - 4.2-1
+- Update to 4.2 release
+- Enable dav1d support
+
 * Sat Jul 27 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.1.4-2
 - Add patch for set_default_priority
 

sources

@@ -1 +1 @@
-5307931aeb7aaee5e1509d9996040661  ffmpeg-4.1.4.tar.xz
+fb33a9110251873002869664686b2a3f  ffmpeg-4.2.tar.xz