- ffmpeg: bump version to 4.1.1

archive-patches/ffmpeg-4.1-allow_to_choose_rtmp_impl_at_runtime.patch → archive-patches/ffmpeg-4.1.1-allow_to_choose_rtmp_impl_at_runtime.patch

@@ -1,6 +1,6 @@
---- a/configure	2018-08-17 11:51:31.066805453 +0200
-+++ b/configure	2018-08-17 12:03:19.617555506 +0200
-@@ -3290,10 +3290,8 @@
+--- a/configure
++++ b/configure
+@@ -3291,10 +3291,8 @@
  # protocols
  async_protocol_deps="threads"
  bluray_protocol_deps="libbluray"
@@ -11,7 +11,7 @@
  ffrtmphttp_protocol_select="http_protocol"
  ftp_protocol_select="tcp_protocol"
  gopher_protocol_select="network"
-@@ -3306,20 +3304,18 @@
+@@ -3307,20 +3305,18 @@
  icecast_protocol_select="http_protocol"
  mmsh_protocol_select="http_protocol"
  mmst_protocol_select="network"
@@ -44,8 +44,8 @@
  rtp_protocol_select="udp_protocol"
  schannel_conflict="openssl gnutls libtls mbedtls"
  sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
---- a/libavformat/Makefile	2018-07-18 15:52:01.000000000 +0200
-+++ b/libavformat/Makefile	2018-08-17 12:06:16.348291303 +0200
+--- a/libavformat/Makefile
++++ b/libavformat/Makefile
 @@ -593,12 +593,12 @@
  OBJS-$(CONFIG_MMST_PROTOCOL)             += mmst.o mms.o asf.o
  OBJS-$(CONFIG_PIPE_PROTOCOL)             += file.o
@@ -65,8 +65,8 @@
  OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o ip.o
  OBJS-$(CONFIG_SCTP_PROTOCOL)             += sctp.o
  OBJS-$(CONFIG_SRTP_PROTOCOL)             += srtpproto.o srtp.o
---- a/libavformat/protocols.c	2018-08-17 12:07:59.489872867 +0200
-+++ b/libavformat/protocols.c	2018-08-17 12:08:24.450255607 +0200
+--- a/libavformat/protocols.c
++++ b/libavformat/protocols.c
 @@ -44,12 +44,12 @@
  extern const URLProtocol ff_md5_protocol;
  extern const URLProtocol ff_pipe_protocol;
@@ -86,8 +86,8 @@
  extern const URLProtocol ff_rtp_protocol;
  extern const URLProtocol ff_sctp_protocol;
  extern const URLProtocol ff_srtp_protocol;
---- a/libavformat/rtmpproto.c	2018-07-18 15:52:02.000000000 +0200
-+++ b/libavformat/rtmpproto.c	2018-08-17 12:11:43.844590847 +0200
+--- a/libavformat/rtmpproto.c
++++ b/libavformat/rtmpproto.c
 @@ -2592,7 +2592,7 @@
  static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **opts)
  {

archive-patches/ffmpeg-4.1-fix_edit_list_parsing.patch → archive-patches/ffmpeg-4.1.1-fix_edit_list_parsing.patch

@@ -1,9 +1,6 @@
-Taapat: disable log to fix freezing on edit list parsing intruduced in:
-http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commitdiff;h=ca6cae73db207f17a0d5507609de12842d8f0ca3
-
 --- a/libavformat/mov.c
 +++ b/libavformat/mov.c
-@@ -3548,8 +3548,10 @@
+@@ -3558,8 +3558,10 @@
  
              if (ctts_data_old && ctts_index_old < ctts_count_old) {
                  curr_ctts = ctts_data_old[ctts_index_old].duration;

archive-patches/ffmpeg-4.1-fix_hls.patch → archive-patches/ffmpeg-4.1.1-fix_hls.patch

@@ -1,5 +1,5 @@
---- a/libavformat/hls.c	2018-08-17 13:06:01.428702126 +0200
-+++ b/libavformat/hls.c	2018-08-17 13:06:15.077944569 +0200
+--- a/libavformat/hls.c
++++ b/libavformat/hls.c
 @@ -2062,8 +2062,10 @@
      HLSContext *c = s->priv_data;
      int ret, i, minplaylist = -1;

archive-patches/ffmpeg-4.1-fix_mpegts.patch → archive-patches/ffmpeg-4.1.1-fix_mpegts.patch

@@ -1,5 +1,5 @@
---- a/libavformat/mpegts.c	2018-02-12 01:29:06.000000000 +0100
-+++ b/libavformat/mpegts.c	2018-02-14 19:36:28.175054407 +0100
+--- a/libavformat/mpegts.c
++++ b/libavformat/mpegts.c
 @@ -948,10 +948,12 @@
      pes->buffer = NULL;
      reset_pes_packet_state(pes);

archive-patches/ffmpeg-4.1-hls_replace_key_uri.patch → archive-patches/ffmpeg-4.1.1-hls_replace_key_uri.patch

@@ -1,5 +1,5 @@
---- a/libavformat/hls.c	2018-08-17 13:16:57.721007600 +0200
-+++ b/libavformat/hls.c	2018-08-17 13:33:57.530170057 +0200
+--- a/libavformat/hls.c
++++ b/libavformat/hls.c
 @@ -208,6 +208,8 @@
      int max_reload;
      int http_persistent;

archive-patches/ffmpeg-4.1-increase_buffer_size.patch → archive-patches/ffmpeg-4.1.1-increase_buffer_size.patch

@@ -1,5 +1,3 @@
-diff --git a/libavformat/avio.h b/libavformat/avio.h
-index 75912ce..56f0a4d 100644
 --- a/libavformat/avio.h
 +++ b/libavformat/avio.h
 @@ -290,12 +290,6 @@ typedef struct AVIOContext {
@@ -15,8 +13,6 @@ index 75912ce..56f0a4d 100644
  
      /**
       * Threshold to favor readahead over seek.
-diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
-index e752d0e..108f089 100644
 --- a/libavformat/aviobuf.c
 +++ b/libavformat/aviobuf.c
 @@ -33,7 +33,7 @@
@@ -65,8 +61,6 @@ index e752d0e..108f089 100644
      s->buffer_size = buf_size;
      s->buf_ptr = s->buf_ptr_max = buffer;
      url_resetbuf(s, s->write_flag ? AVIO_FLAG_WRITE : AVIO_FLAG_READ);
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index c25eab4..02ce5e2 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
 @@ -138,6 +138,25 @@ FF_ENABLE_DEPRECATION_WARNINGS

archive-patches/ffmpeg-4.1-optimize_aac.patch → archive-patches/ffmpeg-4.1.1-optimize_aac.patch

@@ -9,16 +9,8 @@
  {
      int k, n8, n4, n2, n, j;
      const uint16_t *revtab = s->revtab;
-@@ -110,7 +110,6 @@ void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input)
-     const FFTSample *tsin = s->tsin;
-     const FFTSample *in1, *in2;
-     FFTComplex *z = (FFTComplex *)output;
--
-     n = 1 << s->mdct_bits;
-     n2 = n >> 1;
-     n4 = n >> 2;
---- a/libavcodec/aacps.c	2016-01-16 14:08:47.122752224 +0200
-+++ b/libavcodec/aacps.c	2016-01-16 14:15:59.300895278 +0200
+--- a/libavcodec/aacps.c
++++ b/libavcodec/aacps.c
 @@ -659,7 +659,7 @@
      par[ 1] = AAC_HALF_SUM(par[ 0], par[ 1]);
  }
@@ -48,8 +40,8 @@
  {
      FFTDouble t1, t2, t3, t4, t5, t6;
  
---- a/libavcodec/aacdec_template.c	2018-02-16 09:57:05.180695169 +0100
-+++ b/libavcodec/aacdec_template.c	2018-02-16 09:56:13.430147406 +0100
+--- a/libavcodec/aacdec_template.c
++++ b/libavcodec/aacdec_template.c
 @@ -2483,7 +2483,7 @@
   * @param   decode  1 if tool is used normally, 0 if tool is used in LTP.
   * @param   coef    spectral coefficients

make/ffmpeg-armbox.mk

@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-FFMPEG_VER = 4.1
+FFMPEG_VER = 4.1.1
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz
 
 $(ARCHIVE)/$(FFMPEG_SOURCE):