- ffmpeg: bump version to 4.4.2

make/target-ffmpeg.mk

@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-FFMPEG_VERSION = 4.4
+FFMPEG_VERSION = 4.4.2
 FFMPEG_DIR = ffmpeg-$(FFMPEG_VERSION)
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = http://www.ffmpeg.org/releases

package/ffmpeg/patches/ffmpeg-4.4-discon.patch → package/ffmpeg/patches/ffmpeg-4.4.2-discon.patch

@@ -2,7 +2,7 @@ diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
 index 46bb014..00268c6 100644
 --- a/fftools/ffmpeg.c
 +++ b/fftools/ffmpeg.c
-@@ -4516,7 +4516,7 @@ static int process_input(int file_index)
+@@ -4521,7 +4521,7 @@ static int process_input(int file_index)
      if ((ist->dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO ||
           ist->dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) &&
          pkt_dts != AV_NOPTS_VALUE && ist->next_dts == AV_NOPTS_VALUE && !copy_ts
@@ -11,7 +11,7 @@ index 46bb014..00268c6 100644
          int64_t delta   = pkt_dts - ifile->last_ts;
          if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
              delta >  1LL*dts_delta_threshold*AV_TIME_BASE){
-@@ -4554,7 +4554,7 @@ static int process_input(int file_index)
+@@ -4559,7 +4559,7 @@ static int process_input(int file_index)
      if ((ist->dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO ||
           ist->dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) &&
           pkt_dts != AV_NOPTS_VALUE && ist->next_dts != AV_NOPTS_VALUE &&
@@ -20,7 +20,7 @@ index 46bb014..00268c6 100644
          int64_t delta   = pkt_dts - ist->next_dts;
          if (is->iformat->flags & AVFMT_TS_DISCONT) {
              if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
-@@ -4592,6 +4592,43 @@ static int process_input(int file_index)
+@@ -4597,6 +4597,43 @@ static int process_input(int file_index)
      if (pkt->dts != AV_NOPTS_VALUE)
          ifile->last_ts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
  

package/ffmpeg/patches/ffmpeg-4.4-fix_edit_list_parsing.patch → package/ffmpeg/patches/ffmpeg-4.4.2-fix_edit_list_parsing.patch

@@ -1,6 +1,6 @@
 --- a/libavformat/mov.c
 +++ b/libavformat/mov.c
-@@ -3634,8 +3634,10 @@
+@@ -3644,8 +3644,10 @@
  
              if (ctts_data_old && ctts_index_old < ctts_count_old) {
                  curr_ctts = ctts_data_old[ctts_index_old].duration;

package/ffmpeg/patches/ffmpeg-4.4-hls_replace_key_uri.patch → package/ffmpeg/patches/ffmpeg-4.4.2-hls_replace_key_uri.patch

@@ -9,7 +9,7 @@
      AVIOContext *playlist_pb;
  } HLSContext;
  
-@@ -1250,8 +1252,16 @@
+@@ -1256,8 +1258,16 @@
      } else if (seg->key_type == KEY_AES_128) {
          char iv[33], key[33], url[MAX_URL_SIZE];
          if (strcmp(seg->key, pls->key_url)) {
@@ -27,7 +27,7 @@
                  ret = avio_read(pb, pls->key, sizeof(pls->key));
                  if (ret != sizeof(pls->key)) {
                      av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s\n",
-@@ -1263,6 +1273,8 @@
+@@ -1269,6 +1279,8 @@
                         seg->key);
              }
              av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url));
@@ -36,7 +36,7 @@
          }
          ff_data_to_hex(iv, seg->iv, sizeof(seg->iv), 0);
          ff_data_to_hex(key, pls->key, sizeof(pls->key), 0);
-@@ -2399,6 +2411,8 @@
+@@ -2405,6 +2417,8 @@
          OFFSET(http_multiple), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, FLAGS},
      {"http_seekable", "Use HTTP partial requests, 0 = disable, 1 = enable, -1 = auto",
          OFFSET(http_seekable), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, FLAGS},

package/ffmpeg/patches/ffmpeg-4.4-mips64_cpu_detection.patch → package/ffmpeg/patches/ffmpeg-4.4.2-mips64_cpu_detection.patch

@@ -12,7 +12,7 @@ Upstream-Status: Inappropriate [OE-Specific]
 
 --- a/configure
 +++ b/configure
-@@ -5885,17 +5885,10 @@
+@@ -5886,17 +5886,10 @@
  
      # Check toolchain ISA level
      if enabled mips64; then

package/ffmpeg/patches/ffmpeg-4.4.2-nolog.patch

@@ -0,0 +1,24 @@
+diff --git a/libavutil/log.c b/libavutil/log.c
+index 5948e50467..528eaa728c 100644
+--- a/libavutil/log.c
++++ b/libavutil/log.c
+@@ -51,7 +51,7 @@ static AVMutex mutex = AV_MUTEX_INITIALIZER;
+ #define BACKTRACE_LOGLEVEL AV_LOG_ERROR
+ #endif
+ 
+-static int av_log_level = AV_LOG_INFO;
++static int av_log_level = AV_LOG_ERROR; // NOT WORKING for libs
+ static int flags;
+ 
+ #define NB_LEVELS 8
+@@ -406,10 +406,6 @@ static void (*av_log_callback)(void*, int, const char*, va_list) =
+ 
+ void av_log(void* avcl, int level, const char *fmt, ...)
+ {
+-    va_list vl;
+-    va_start(vl, fmt);
+-    av_vlog(avcl, level, fmt, vl);
+-    va_end(vl);
+ }
+ 
+ void av_log_once(void* avcl, int initial_level, int subsequent_level, int *state, const char *fmt, ...)

package/ffmpeg/patches/ffmpeg-4.4-optimize_aac.patch → package/ffmpeg/patches/ffmpeg-4.4.2-optimize_aac.patch

@@ -1,6 +1,6 @@
 --- a/libavcodec/aacdec_template.c
 +++ b/libavcodec/aacdec_template.c
-@@ -2583,7 +2583,7 @@
+@@ -2588,7 +2588,7 @@
   * @param   decode  1 if tool is used normally, 0 if tool is used in LTP.
   * @param   coef    spectral coefficients
   */

package/ffmpeg/patches/ffmpeg-4.4-recheck_discard_flags.patch → package/ffmpeg/patches/ffmpeg-4.4.2-recheck_discard_flags.patch

@@ -1,6 +1,6 @@
 --- a/libavformat/hls.c
 +++ b/libavformat/hls.c
-@@ -2165,8 +2165,10 @@
+@@ -2171,8 +2171,10 @@
      HLSContext *c = s->priv_data;
      int ret, i, minplaylist = -1;