oasis

commit: 3a62a56b12866b9ec733fd6dcd5ff961bdf54524
parent bd82e2ff24d47c0ea28a1231110c6628318a1328
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 15 Nov 2021 14:04:55 -0800

ffmpeg: Update to 4.4.1

Diffstat:
M
pkg/ffmpeg/patch/0004-libavformat-Use-C99-__func__-instead-of-non-standard.patch
10
+++++-----
M
pkg/ffmpeg/patch/0005-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
8
++++----
M
pkg/ffmpeg/ver
2
+-

3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/ffmpeg/patch/0004-libavformat-Use-C99-__func__-instead-of-non-standard.patch b/pkg/ffmpeg/patch/0004-libavformat-Use-C99-__func__-instead-of-non-standard.patch
@@ -1,4 +1,4 @@
-From f3b0469079853d304fe583f9849f3f75138ee980 Mon Sep 17 00:00:00 2001
+From 178c29e21ade1ced553d153a9bcab716abed3362 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
@@ -23,10 +23,10 @@ index 6a557d294e..23eda49eb6 100644
  
      guess_pkt_duration(s, st, pkt);
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 1384b56771..05a3e0221f 100644
+index 75e5350a27..5480a87620 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
-@@ -3702,7 +3702,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
+@@ -3704,7 +3704,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
              && codec && !avctx->codec) {
              if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
                  av_log(ic, AV_LOG_WARNING,
@@ -35,7 +35,7 @@ index 1384b56771..05a3e0221f 100644
          }
  
          // Try to just open decoders, in case this is enough to get parameters.
-@@ -3710,7 +3710,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
+@@ -3712,7 +3712,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
              if (codec && !avctx->codec)
                  if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
                      av_log(ic, AV_LOG_WARNING,
@@ -44,7 +44,7 @@ index 1384b56771..05a3e0221f 100644
          }
          if (!options)
              av_dict_free(&thread_opt);
-@@ -3965,7 +3965,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
+@@ -3969,7 +3969,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
                          av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0);
                      if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0)
                          av_log(ic, AV_LOG_WARNING,
diff --git a/pkg/ffmpeg/patch/0005-libavcodec-Use-if-to-prevent-some-unintended-depende.patch b/pkg/ffmpeg/patch/0005-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
@@ -1,4 +1,4 @@
-From 0785a7f2102a9c8f50f19c7b4addbd849e071abc Mon Sep 17 00:00:00 2001
+From 71b3efc1e55297cbe079378c1e0127c78fe264f5 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
@@ -9,10 +9,10 @@ Subject: [PATCH] libavcodec: Use #if to prevent some unintended dependencies
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/libavcodec/h263.h b/libavcodec/h263.h
-index 998f7d0d59..4d867d7bf2 100644
+index 491f2e0aac..6f4088e57c 100644
 --- a/libavcodec/h263.h
 +++ b/libavcodec/h263.h
-@@ -98,6 +98,7 @@ int ff_h263_resync(MpegEncContext *s);
+@@ -99,6 +99,7 @@ int ff_h263_resync(MpegEncContext *s);
  void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
  
  
@@ -20,7 +20,7 @@ index 998f7d0d59..4d867d7bf2 100644
  static inline int h263_get_motion_length(int val, int f_code){
      int l, bit_size, code;
  
-@@ -182,5 +183,6 @@ static inline int get_p_cbp(MpegEncContext * s,
+@@ -183,5 +184,6 @@ static inline int get_p_cbp(MpegEncContext * s,
      }
      return cbp;
  }
diff --git a/pkg/ffmpeg/ver b/pkg/ffmpeg/ver
@@ -1 +1 @@
-4.4 r2
+4.4.1 r0