diff --git a/archive-patches/ffmpeg-4.0.3-allow_to_choose_rtmp_impl_at_runtime.patch b/archive-patches/ffmpeg-4.0.3-allow_to_choose_rtmp_impl_at_runtime.patch deleted file mode 100644 index ceeb5838..00000000 --- a/archive-patches/ffmpeg-4.0.3-allow_to_choose_rtmp_impl_at_runtime.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/configure 2018-08-17 11:51:31.066805453 +0200 -+++ b/configure 2018-08-17 12:03:19.617555506 +0200 -@@ -3229,10 +3229,8 @@ - # protocols - async_protocol_deps="threads" - bluray_protocol_deps="libbluray" --ffrtmpcrypt_protocol_conflict="librtmp_protocol" - ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl" - ffrtmpcrypt_protocol_select="tcp_protocol" --ffrtmphttp_protocol_conflict="librtmp_protocol" - ffrtmphttp_protocol_select="http_protocol" - ftp_protocol_select="tcp_protocol" - gopher_protocol_select="network" -@@ -3255,20 +3253,18 @@ - mmst_protocol_select="network" - libsrt_protocol_deps="libsrt" - libsrt_protocol_select="network" --rtmp_protocol_conflict="librtmp_protocol" --rtmp_protocol_select="tcp_protocol" --rtmp_protocol_suggest="zlib" --rtmpe_protocol_select="ffrtmpcrypt_protocol" --rtmpe_protocol_suggest="zlib" --rtmps_protocol_conflict="librtmp_protocol" --rtmps_protocol_select="tls_protocol" --rtmps_protocol_suggest="zlib" --rtmpt_protocol_select="ffrtmphttp_protocol" --rtmpt_protocol_suggest="zlib" --rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol" --rtmpte_protocol_suggest="zlib" --rtmpts_protocol_select="ffrtmphttp_protocol https_protocol" --rtmpts_protocol_suggest="zlib" -+ffrtmp_protocol_select="tcp_protocol" -+ffrtmp_protocol_suggest="zlib" -+ffrtmpe_protocol_select="ffrtmpcrypt_protocol" -+ffrtmpe_protocol_suggest="zlib" -+ffrtmps_protocol_select="tls_protocol" -+ffrtmps_protocol_suggest="zlib" -+ffrtmpt_protocol_select="ffrtmphttp_protocol" -+ffrtmpt_protocol_suggest="zlib" -+ffrtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol" -+ffrtmpte_protocol_suggest="zlib" -+ffrtmpts_protocol_select="ffrtmphttp_protocol https_protocol" -+ffrtmpts_protocol_suggest="zlib" - rtp_protocol_select="udp_protocol" - schannel_conflict="openssl gnutls libtls" - 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 -@@ -594,12 +594,12 @@ - OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o - OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o - OBJS-$(CONFIG_PROMPEG_PROTOCOL) += prompeg.o --OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o --OBJS-$(CONFIG_RTMPE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o --OBJS-$(CONFIG_RTMPS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o --OBJS-$(CONFIG_RTMPT_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o --OBJS-$(CONFIG_RTMPTE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o --OBJS-$(CONFIG_RTMPTS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMP_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMPE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMPS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMPT_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMPTE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o -+OBJS-$(CONFIG_FFRTMPTS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o - OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.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 -@@ -44,12 +44,12 @@ - extern const URLProtocol ff_md5_protocol; - extern const URLProtocol ff_pipe_protocol; - extern const URLProtocol ff_prompeg_protocol; --extern const URLProtocol ff_rtmp_protocol; --extern const URLProtocol ff_rtmpe_protocol; --extern const URLProtocol ff_rtmps_protocol; --extern const URLProtocol ff_rtmpt_protocol; --extern const URLProtocol ff_rtmpte_protocol; --extern const URLProtocol ff_rtmpts_protocol; -+extern const URLProtocol ff_ffrtmp_protocol; -+extern const URLProtocol ff_ffrtmpe_protocol; -+extern const URLProtocol ff_ffrtmps_protocol; -+extern const URLProtocol ff_ffrtmpt_protocol; -+extern const URLProtocol ff_ffrtmpte_protocol; -+extern const URLProtocol ff_ffrtmpts_protocol; - 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 -@@ -2592,7 +2592,7 @@ - static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **opts) - { - RTMPContext *rt = s->priv_data; -- char proto[8], hostname[256], path[1024], auth[100], *fname; -+ char *proto, tmpProto[10], hostname[256], path[1024], auth[100], *fname; - char *old_app, *qmark, *n, fname_buffer[1024]; - uint8_t buf[2048]; - int port; -@@ -2603,7 +2603,9 @@ - - rt->is_input = !(flags & AVIO_FLAG_WRITE); - -- av_url_split(proto, sizeof(proto), auth, sizeof(auth), -+ memset(tmpProto, 0, sizeof(tmpProto)); -+ proto = &tmpProto[2]; -+ av_url_split(tmpProto, sizeof(tmpProto), auth, sizeof(auth), - hostname, sizeof(hostname), &port, - path, sizeof(path), s->filename); - -@@ -3137,9 +3139,9 @@ - }; - - --RTMP_PROTOCOL(rtmp) --RTMP_PROTOCOL(rtmpe) --RTMP_PROTOCOL(rtmps) --RTMP_PROTOCOL(rtmpt) --RTMP_PROTOCOL(rtmpte) --RTMP_PROTOCOL(rtmpts) -+RTMP_PROTOCOL(ffrtmp) -+RTMP_PROTOCOL(ffrtmpe) -+RTMP_PROTOCOL(ffrtmps) -+RTMP_PROTOCOL(ffrtmpt) -+RTMP_PROTOCOL(ffrtmpte) -+RTMP_PROTOCOL(ffrtmpts) diff --git a/archive-patches/ffmpeg-4.0.3-fix_edit_list_parsing.patch b/archive-patches/ffmpeg-4.1-fix_edit_list_parsing.patch similarity index 97% rename from archive-patches/ffmpeg-4.0.3-fix_edit_list_parsing.patch rename to archive-patches/ffmpeg-4.1-fix_edit_list_parsing.patch index 8bb2e082..a40d459b 100644 --- a/archive-patches/ffmpeg-4.0.3-fix_edit_list_parsing.patch +++ b/archive-patches/ffmpeg-4.1-fix_edit_list_parsing.patch @@ -3,7 +3,7 @@ http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commitdiff;h=ca6ca --- a/libavformat/mov.c +++ b/libavformat/mov.c -@@ -3542,8 +3542,10 @@ +@@ -3548,8 +3548,10 @@ if (ctts_data_old && ctts_index_old < ctts_count_old) { curr_ctts = ctts_data_old[ctts_index_old].duration; diff --git a/archive-patches/ffmpeg-4.0.3-fix_hls.patch b/archive-patches/ffmpeg-4.1-fix_hls.patch similarity index 95% rename from archive-patches/ffmpeg-4.0.3-fix_hls.patch rename to archive-patches/ffmpeg-4.1-fix_hls.patch index 861d6ae3..45e38dda 100644 --- a/archive-patches/ffmpeg-4.0.3-fix_hls.patch +++ b/archive-patches/ffmpeg-4.1-fix_hls.patch @@ -1,6 +1,6 @@ --- a/libavformat/hls.c 2018-08-17 13:06:01.428702126 +0200 +++ b/libavformat/hls.c 2018-08-17 13:06:15.077944569 +0200 -@@ -2079,8 +2079,10 @@ +@@ -2062,8 +2062,10 @@ HLSContext *c = s->priv_data; int ret, i, minplaylist = -1; diff --git a/archive-patches/ffmpeg-4.0.3-fix_mpegts.patch b/archive-patches/ffmpeg-4.1-fix_mpegts.patch similarity index 95% rename from archive-patches/ffmpeg-4.0.3-fix_mpegts.patch rename to archive-patches/ffmpeg-4.1-fix_mpegts.patch index fe7c2a0b..3e6b9d25 100644 --- a/archive-patches/ffmpeg-4.0.3-fix_mpegts.patch +++ b/archive-patches/ffmpeg-4.1-fix_mpegts.patch @@ -1,7 +1,7 @@ diff -uNr ffmpeg-3.4.2/libavformat/mpegts.c ffmpeg-3.4.2_fix_mpegts/libavformat/mpegts.c --- ffmpeg-3.4.2/libavformat/mpegts.c 2018-02-12 01:29:06.000000000 +0100 +++ ffmpeg-3.4.2_fix_mpegts/libavformat/mpegts.c 2018-02-14 19:36:28.175054407 +0100 -@@ -930,10 +930,12 @@ +@@ -948,10 +948,12 @@ pes->buffer = NULL; reset_pes_packet_state(pes); diff --git a/archive-patches/ffmpeg-4.0.3-hls_replace_key_uri.patch b/archive-patches/ffmpeg-4.1-hls_replace_key_uri.patch similarity index 100% rename from archive-patches/ffmpeg-4.0.3-hls_replace_key_uri.patch rename to archive-patches/ffmpeg-4.1-hls_replace_key_uri.patch diff --git a/archive-patches/ffmpeg-4.0.3-increase_buffer_size.patch b/archive-patches/ffmpeg-4.1-increase_buffer_size.patch similarity index 100% rename from archive-patches/ffmpeg-4.0.3-increase_buffer_size.patch rename to archive-patches/ffmpeg-4.1-increase_buffer_size.patch diff --git a/archive-patches/ffmpeg-4.0.3-optimize_aac.patch b/archive-patches/ffmpeg-4.1-optimize_aac.patch similarity index 98% rename from archive-patches/ffmpeg-4.0.3-optimize_aac.patch rename to archive-patches/ffmpeg-4.1-optimize_aac.patch index b6ce2d48..e8d7c5cc 100644 --- a/archive-patches/ffmpeg-4.0.3-optimize_aac.patch +++ b/archive-patches/ffmpeg-4.1-optimize_aac.patch @@ -30,7 +30,7 @@ LOCAL_ALIGNED_16(INTFLOAT, transient_gain, [34], [PS_QMF_TIME_SLOTS]); --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c -@@ -536,7 +536,7 @@ +@@ -538,7 +538,7 @@ pass(z,FFT_NAME(ff_cos_##n),n4/2);\ } @@ -39,7 +39,7 @@ { FFTDouble t1, t2, t3, t4, t5, t6, t7, t8; -@@ -550,7 +550,7 @@ +@@ -552,7 +552,7 @@ BF(z[2].im, z[0].im, t2, t5); } diff --git a/make/ffmpeg-armbox.mk b/make/ffmpeg-armbox.mk index 33d4a6bd..4c793e40 100644 --- a/make/ffmpeg-armbox.mk +++ b/make/ffmpeg-armbox.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -FFMPEG_VER = 4.0.3 +FFMPEG_VER = 4.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz $(ARCHIVE)/$(FFMPEG_SOURCE): @@ -19,7 +19,6 @@ FFMPEG_PATCH += ffmpeg-$(FFMPEG_VER)-optimize_aac.patch FFMPEG_PATCH += ffmpeg-$(FFMPEG_VER)-fix_edit_list_parsing.patch # ffmpeg exteplayer3 patches FFMPEG_PATCH += ffmpeg-$(FFMPEG_VER)-fix_mpegts.patch -FFMPEG_PATCH += ffmpeg-$(FFMPEG_VER)-allow_to_choose_rtmp_impl_at_runtime.patch FFMPEG_PATCH += ffmpeg-$(FFMPEG_VER)-hls_replace_key_uri.patch # -----------------------------------------------------------------------------