From cd3bdd1a008f1999fae104868e273cc3e926904f Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 6 Apr 2019 10:06:31 +0200
Subject: [PATCH] Backport upstream patch

---
 ...293fcf59edb56879c36edcd25f0a91e0edf8.patch | 32 +++++++++++++++++++
 ffmpeg.spec                                   |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 4361293fcf59edb56879c36edcd25f0a91e0edf8.patch

diff --git a/4361293fcf59edb56879c36edcd25f0a91e0edf8.patch b/4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
new file mode 100644
index 0000000..7ade867
--- /dev/null
+++ b/4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
@@ -0,0 +1,32 @@
+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
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f2e2dcb..3f36079 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -90,6 +90,9 @@ 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
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
 %{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -314,6 +317,7 @@ 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