contrib: Update to Libav 12.2.

3 files changed, 3 insertions, 135 deletions

diff --git a/contrib/ffmpeg/A21-h264-reflist.patch b/contrib/ffmpeg/A21-h264-reflist.patch
deleted file mode 100644
index 8c7a51d5f..000000000
--- a/contrib/ffmpeg/A21-h264-reflist.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 67d5f1023e4299a5f2741e2523e559d892f1bb56 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <[email protected]>
-Date: Thu, 17 Aug 2017 12:15:58 +0200
-Subject: [PATCH] h264dec: use a large enough field for reference list
- modification values
-
-pic_num can be at most 17-bit, so uint8_t is not sufficient.
-
-Found-By: Bradley Sepos <[email protected]>
-CC: [email protected]
-(cherry picked from commit f70f71d60c7ae88c19078a48dc6e0789b78c7300)
-Signed-off-by: Anton Khirnov <[email protected]>
----
- libavcodec/h264dec.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
-index d27f98b..b815aa4 100644
---- a/libavcodec/h264dec.h
-+++ b/libavcodec/h264dec.h
-@@ -268,7 +268,7 @@ typedef struct H264SliceContext {
-                                          *   according to picture reordering in slice header */
-     struct {
-         uint8_t op;
--        uint8_t val;
-+        uint32_t val;
-     } ref_modifications[2][32];
-     int nb_ref_modifications[2];
- 
--- 
-2.1.4
diff --git a/contrib/ffmpeg/A22-yadif-bounds.patch b/contrib/ffmpeg/A22-yadif-bounds.patch
deleted file mode 100644
index 4368b7491..000000000
--- a/contrib/ffmpeg/A22-yadif-bounds.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From a8d69ef32f27a1084f3a55daa917468ea845d5b6 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <[email protected]>
-Date: Mon, 21 Aug 2017 09:55:48 +0200
-Subject: [PATCH] yadif: Account for the buffer alignment while processing the
- frame edges
-
-Avoid out of bound reads.
-
-Bug-Id: 1031
-CC: [email protected]
-Signed-off-by: Luca Barbato <[email protected]>
-(cherry picked from commit feed239021bad89743d5e7989b426ae594322eb7)
-Signed-off-by: Luca Barbato <[email protected]>
----
- libavfilter/vf_yadif.c | 28 +++++++++++++++++++---------
- 1 file changed, 19 insertions(+), 9 deletions(-)
-
-diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
-index 75f2d17..bef357b 100644
---- a/libavfilter/vf_yadif.c
-+++ b/libavfilter/vf_yadif.c
-@@ -40,6 +40,8 @@ typedef struct ThreadData {
-     int tff;
- } ThreadData;
- 
-+#define MAX_ALIGN 8
-+
- #define CHECK(j)\
-     {   int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\
-                   + FFABS(cur[mrefs  +(j)] - cur[prefs  -(j)])\
-@@ -123,17 +125,20 @@ static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1,
-     uint8_t *prev2 = parity ? prev : cur ;
-     uint8_t *next2 = parity ? cur  : next;
- 
-+    const int edge = MAX_ALIGN - 1;
-+
-     /* Only edge pixels need to be processed here.  A constant value of false
-      * for is_not_edge should let the compiler ignore the whole branch. */
-     FILTER(0, 3, 0)
- 
--    dst  = (uint8_t*)dst1  + w - 3;
--    prev = (uint8_t*)prev1 + w - 3;
--    cur  = (uint8_t*)cur1  + w - 3;
--    next = (uint8_t*)next1 + w - 3;
-+    dst  = (uint8_t*)dst1  + w - edge;
-+    prev = (uint8_t*)prev1 + w - edge;
-+    cur  = (uint8_t*)cur1  + w - edge;
-+    next = (uint8_t*)next1 + w - edge;
-     prev2 = (uint8_t*)(parity ? prev : cur);
-     next2 = (uint8_t*)(parity ? cur  : next);
- 
-+    FILTER(w - edge, w - 3, 1)
-     FILTER(w - 3, w, 0)
- }
- 
-@@ -166,18 +171,22 @@ static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1,
-     int x;
-     uint16_t *prev2 = parity ? prev : cur ;
-     uint16_t *next2 = parity ? cur  : next;
-+
-+    const int edge = MAX_ALIGN / 2 - 1;
-+
-     mrefs /= 2;
-     prefs /= 2;
- 
-     FILTER(0, 3, 0)
- 
--    dst   = (uint16_t*)dst1  + w - 3;
--    prev  = (uint16_t*)prev1 + w - 3;
--    cur   = (uint16_t*)cur1  + w - 3;
--    next  = (uint16_t*)next1 + w - 3;
-+    dst   = (uint16_t*)dst1  + w - edge;
-+    prev  = (uint16_t*)prev1 + w - edge;
-+    cur   = (uint16_t*)cur1  + w - edge;
-+    next  = (uint16_t*)next1 + w - edge;
-     prev2 = (uint16_t*)(parity ? prev : cur);
-     next2 = (uint16_t*)(parity ? cur  : next);
- 
-+    FILTER(w - edge, w - 3, 1)
-     FILTER(w - 3, w, 0)
- }
- 
-@@ -192,6 +201,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-     int slice_start = jobnr * slice_h;
-     int slice_end   = (jobnr == nb_jobs - 1) ? td->h : (jobnr + 1) * slice_h;
-     int y;
-+    int edge = 3 + MAX_ALIGN / df - 1;
- 
-     /* filtering reads 3 pixels to the left/right; to avoid invalid reads,
-      * we need to call the c variant which avoids this for border pixels
-@@ -204,7 +214,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-             uint8_t *dst  = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]];
-             int     mode  = y == 1 || y + 2 == td->h ? 2 : s->mode;
-             s->filter_line(dst + pix_3, prev + pix_3, cur + pix_3,
--                           next + pix_3, td->w - 6,
-+                           next + pix_3, td->w - edge,
-                            y + 1 < td->h ? refs : -refs,
-                            y ? -refs : refs,
-                            td->parity ^ td->tff, mode);
--- 
-2.1.4
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 5280a1437..e89440d58 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -9,9 +9,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/libav-12.1.tar.gz
-FFMPEG.FETCH.url += https://libav.org/releases/libav-12.1.tar.gz
-FFMPEG.FETCH.sha256 = f08d48bfd26097402d61f831e77effd53d0838fdeccb02ea85ec3c5d2a4527e1
+FFMPEG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libav-12.2.tar.gz
+FFMPEG.FETCH.url += https://libav.org/releases/libav-12.2.tar.gz
+FFMPEG.FETCH.sha256 = 49c3ccda32458192c00ab25b30f4d1a6a4772b83458cbbf3a25b210d0688f55c
 
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.host  =