add ffmpeg whitelist patch

diff --git a/archive-patches/ffmpeg/ffmpeg-3.3_whitelist.patch b/archive-patches/ffmpeg/ffmpeg-3.3_whitelist.patch
new file mode 100644 (file)
index 0000000..df1560f
--- /dev/null
+++ b/archive-patches/ffmpeg/ffmpeg-3.3_whitelist.patch
@@ -0,0 +1,19 @@
+diff --git a/libavformat/avio.c b/libavformat/avio.c
+index 4846bbd8c6..978bf72994 100644
+--- a/libavformat/avio.c
++++ b/libavformat/avio.c
+@@ -180,12 +180,12 @@ int ffurl_connect(URLContext *uc, AVDictionary **options)
+                (uc->protocol_whitelist && !strcmp(uc->protocol_whitelist, e->value)));
+     av_assert0(!(e=av_dict_get(*options, "protocol_blacklist", NULL, 0)) ||
+                (uc->protocol_blacklist && !strcmp(uc->protocol_blacklist, e->value)));
+-
++/*
+     if (uc->protocol_whitelist && av_match_list(uc->prot->name, uc->protocol_whitelist, ',') <= 0) {
+         av_log(uc, AV_LOG_ERROR, "Protocol '%s' not on whitelist '%s'!\n", uc->prot->name, uc->protocol_whitelist);
+         return AVERROR(EINVAL);
+     }
+-
++*/
+     if (uc->protocol_blacklist && av_match_list(uc->prot->name, uc->protocol_blacklist, ',') > 0) {
+         av_log(uc, AV_LOG_ERROR, "Protocol '%s' on blacklist '%s'!\n", uc->prot->name, uc->protocol_blacklist);
+         return AVERROR(EINVAL);

diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index b6349185d602de3a13004580420584abf06c1531..5b5698e49dc817d442dc058c90155b4d133116e4 100644 (file)
--- a/make/ffmpeg.mk
+++ b/make/ffmpeg.mk
@@ -517,6 +517,7 @@ ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREFIX)
                $(PATCH)/ffmpeg/0007-ffmpeg-reset-compressed-header-flag.patch; \
                $(PATCH)/ffmpeg/0008-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.-Origi.patch; \
                $(PATCH)/ffmpeg/ffmpeg-3.3_cst-allow-to-choose-rtmp-impl-at-runtime.patch; \
+               $(PATCH)/ffmpeg/ffmpeg-3.3_whitelist.patch; \
                $(BUILDENV) \
                ./configure \
                        $(FFMPEG_CONFIGURE) \