ffmpeg: Update to 6.0

5 files changed, 29 insertions, 29 deletions

diff --git a/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch b/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
index b46c0688..cba90626 100644
--- a/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
+++ b/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
@@ -1,4 +1,4 @@
-From d117054cbf83a3ad3a0385c37a5dbbf75a10b5f5 Mon Sep 17 00:00:00 2001
+From e556055b4cfae9c170092f426b450630fa126b37 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:41:48 -0700
 Subject: [PATCH] libavcodec: Prevent stray semicolon at top-level
@@ -13,28 +13,28 @@ is no problem if it expands to an empty token sequence.
  1 file changed, 36 insertions(+), 36 deletions(-)
 
 diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
-index 471075ad71..c7bb50e061 100644
+index 23955ba2dd..295ee4e986 100644
 --- a/libavcodec/pcm.c
 +++ b/libavcodec/pcm.c
-@@ -565,7 +565,7 @@ const FFCodec ff_ ## name_ ## _encoder = {                                  \
+@@ -559,7 +559,7 @@ const FFCodec ff_ ## name_ ## _encoder = {                                  \
+     FF_CODEC_ENCODE_CB(pcm_encode_frame),                                   \
      .p.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_,             \
                                                     AV_SAMPLE_FMT_NONE },    \
-     .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,                          \
 -}
 +};
  
  #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name)                  \
      PCM_ENCODER_ ## cf(id, sample_fmt, name, long_name)
-@@ -588,7 +588,7 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
+@@ -581,7 +581,7 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
+     .p.capabilities = AV_CODEC_CAP_DR1,                                     \
      .p.sample_fmts  = (const enum AVSampleFormat[]){ sample_fmt_,           \
                                                       AV_SAMPLE_FMT_NONE },  \
-     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,                         \
 -}
 +};
  
  #define PCM_DECODER_2(cf, id, sample_fmt, name, long_name)                  \
      PCM_DECODER_ ## cf(id, sample_fmt, name, long_name)
-@@ -598,40 +598,40 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
+@@ -591,40 +591,40 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
      PCM_DECODER_3(CONFIG_ ## id ## _DECODER, id, sample_fmt, name, long_name)
  
  #define PCM_CODEC(id, sample_fmt_, name, long_name_)                    \
diff --git a/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch b/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch
index 24c05c32..ceb489ac 100644
--- a/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch
+++ b/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch
@@ -1,4 +1,4 @@
-From d0cf1c91f842993121bc24874153f5959dbd95f3 Mon Sep 17 00:00:00 2001
+From 8979dddfb4ecd1e8570d181f34781146e543cfe2 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:43:25 -0700
 Subject: [PATCH] libavformat: Use C99 __func__ instead of non-standard
@@ -9,10 +9,10 @@ Subject: [PATCH] libavformat: Use C99 __func__ instead of non-standard
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libavformat/mux.c b/libavformat/mux.c
-index 31361f9b46..8dcf4047dc 100644
+index 04de05ec17..3510b56b0b 100644
 --- a/libavformat/mux.c
 +++ b/libavformat/mux.c
-@@ -1108,7 +1108,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt,
+@@ -1114,7 +1114,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt,
      int ret;
  
      if (s->debug & FF_FDEBUG_TS)
diff --git a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch b/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
index 6cad7e43..62bdc96f 100644
--- a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
+++ b/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
@@ -1,4 +1,4 @@
-From a7dd6d3b3467b46ff767d68b488fd17a32b54c7f Mon Sep 17 00:00:00 2001
+From 423031475f19346601a913dd24ae5ace3d0d9739 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:44:53 -0700
 Subject: [PATCH] libavcodec: Use #if to prevent some unintended dependencies
@@ -8,10 +8,10 @@ Subject: [PATCH] libavcodec: Use #if to prevent some unintended dependencies
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
-index 9a450b7c8e..cc920c6067 100644
+index 8922f5b1a5..40c364a5cc 100644
 --- a/libavcodec/mpegvideo_motion.c
 +++ b/libavcodec/mpegvideo_motion.c
-@@ -361,10 +361,11 @@ void mpeg_motion_internal(MpegEncContext *s,
+@@ -207,10 +207,11 @@ void mpeg_motion_internal(MpegEncContext *s,
          pix_op[s->chroma_x_shift][uvdxy]
              (dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
      }
@@ -25,7 +25,7 @@ index 9a450b7c8e..cc920c6067 100644
  }
  /* apply one mpeg motion vector to the three components */
  static void mpeg_motion(MpegEncContext *s,
-@@ -861,11 +862,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s,
+@@ -702,11 +703,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s,
                          0, 0, 0,
                          ref_picture, pix_op, qpix_op,
                          s->mv[dir][0][0], s->mv[dir][0][1], 16);
diff --git a/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch b/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch
index 23c79c21..bf67e4d9 100644
--- a/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch
+++ b/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch
@@ -1,4 +1,4 @@
-From 638e9a0d00cf2154224eb6f48e5c90a99ad4fdf1 Mon Sep 17 00:00:00 2001
+From a071cbecc751b78c4d0ff89356e4c0fca16d266d Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:46:57 -0700
 Subject: [PATCH] libavutil: Use config instead of compiler to determine
@@ -9,7 +9,7 @@ Subject: [PATCH] libavutil: Use config instead of compiler to determine
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/libavutil/x86/intreadwrite.h b/libavutil/x86/intreadwrite.h
-index 4061d19231..b7d19ed8a3 100644
+index 40f375b013..c45e8439e0 100644
 --- a/libavutil/x86/intreadwrite.h
 +++ b/libavutil/x86/intreadwrite.h
 @@ -25,9 +25,9 @@
@@ -22,9 +22,9 @@ index 4061d19231..b7d19ed8a3 100644
 -#if !HAVE_FAST_64BIT && defined(__MMX__)
 +#if !HAVE_FAST_64BIT
  
- #define AV_COPY64 AV_COPY64
- static av_always_inline void AV_COPY64(void *d, const void *s)
-@@ -59,9 +59,9 @@ static av_always_inline void AV_ZERO64(void *d)
+ #define FF_COPY_SWAP_ZERO_USES_MMX
+ 
+@@ -61,9 +61,9 @@ static av_always_inline void AV_ZERO64(void *d)
              :: "mm0");
  }
  
@@ -36,7 +36,7 @@ index 4061d19231..b7d19ed8a3 100644
  
  #define AV_COPY128 AV_COPY128
  static av_always_inline void AV_COPY128(void *d, const void *s)
-@@ -77,7 +77,7 @@ static av_always_inline void AV_COPY128(void *d, const void *s)
+@@ -79,7 +79,7 @@ static av_always_inline void AV_COPY128(void *d, const void *s)
  
  #endif /* __SSE__ */
  
@@ -45,7 +45,7 @@ index 4061d19231..b7d19ed8a3 100644
  
  #define AV_ZERO128 AV_ZERO128
  static av_always_inline void AV_ZERO128(void *d)
-@@ -90,8 +90,8 @@ static av_always_inline void AV_ZERO128(void *d)
+@@ -92,8 +92,8 @@ static av_always_inline void AV_ZERO128(void *d)
              :: "xmm0");
  }
  
@@ -57,5 +57,5 @@ index 4061d19231..b7d19ed8a3 100644
  
  #endif /* AVUTIL_X86_INTREADWRITE_H */
 -- 
-2.32.0
+2.37.3
 
diff --git a/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch b/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
index 7c4efc75..2002613a 100644
--- a/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
+++ b/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
@@ -1,17 +1,17 @@
-From be0fa40e9d56ff85c3329ce7452bf33215fbd678 Mon Sep 17 00:00:00 2001
+From 788b21499ade6f5f03a4c79f7a8a82e9af873af4 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 25 Oct 2021 17:08:29 -0700
 Subject: [PATCH] libavutil: Use C11 _Alignas as fallback for DECLARE_ALIGNED
 
 ---
- libavutil/mem.h | 4 ++++
+ libavutil/mem_internal.h | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/libavutil/mem.h b/libavutil/mem.h
-index d91174196c..996e9b14b0 100644
---- a/libavutil/mem.h
-+++ b/libavutil/mem.h
-@@ -120,6 +120,10 @@
+diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
+index 2448c606f1..dd037fd3b5 100644
+--- a/libavutil/mem_internal.h
++++ b/libavutil/mem_internal.h
+@@ -91,6 +91,10 @@
      #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
      #define DECLARE_ASM_ALIGNED(n,t,v)  __declspec(align(n)) t v
      #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v