contrib: Update to FFmpeg 4.2.

3 files changed, 3 insertions, 66 deletions

diff --git a/contrib/ffmpeg/A01-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch b/contrib/ffmpeg/A01-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
deleted file mode 100644
index e6fe7c191..000000000
--- a/contrib/ffmpeg/A01-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4361293fcf59edb56879c36edcd25f0a91e0edf8 Mon Sep 17 00:00:00 2001
-From: Mark Harris <[email protected]>
-Date: Sat, 24 Nov 2018 13:02:02 -0800
-Subject: [PATCH] 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 <[email protected]>
----
- libavutil/mem.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavutil/mem.h b/libavutil/mem.h
-index 55ae573ac9..5fb1a02dd9 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.21.0
-
diff --git a/contrib/ffmpeg/A10-mpeg-quarter-sample.patch b/contrib/ffmpeg/A10-mpeg-quarter-sample.patch
deleted file mode 100644
index a2febd761..000000000
--- a/contrib/ffmpeg/A10-mpeg-quarter-sample.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5282db5929f25ca9566a47ad217794842b364afc Mon Sep 17 00:00:00 2001
-From: Andriy Gelman <[email protected]>
-Date: Wed, 12 Dec 2018 23:57:35 -0500
-Subject: [PATCH] avcodec/mpeg: Initialize quarter_sample parameter from
- previous thread.
-
-Fixes #7410.
-The value of sub-pixel precision for me/mc can change during an Intra frame. In multi-threaded decoding this change is not propagated to other frame threads causing decoding artifacts. This patch initializes the sub-pixel precision parameter from previous thread, which fixes the issue.
-
-Signed-off-by: Michael Niedermayer <[email protected]>
----
- libavcodec/mpegvideo.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
-index d4d3bea..dbb6ab9 100644
---- a/libavcodec/mpegvideo.c
-+++ b/libavcodec/mpegvideo.c
-@@ -538,6 +538,8 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
-     s->avctx->width         = s1->avctx->width;
-     s->avctx->height        = s1->avctx->height;
- 
-+    s->quarter_sample       = s1->quarter_sample;
-+
-     s->coded_picture_number = s1->coded_picture_number;
-     s->picture_number       = s1->picture_number;
- 
--- 
-1.9.1
-
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 5d619359d..afbe4881a 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -12,9 +12,9 @@ endif
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url  = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.1.3.tar.bz2
-FFMPEG.FETCH.url += https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2
-FFMPEG.FETCH.sha256 = 29a679685bd7bc29158110f367edf67b31b451f2176f9d79d0f342b9e22d6a2a
+FFMPEG.FETCH.url  = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.tar.bz2
+FFMPEG.FETCH.url += https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
+FFMPEG.FETCH.sha256 = 306bde5f411e9ee04352d1d3de41bd3de986e42e2af2a4c44052dce1ada26fb8
 
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.host  =