[vlc-commits] contrib: ffmpeg: do not build the concat protocol

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 16 15:55:33 2016 +0200| [fb70035a4823a1c1d6069f746c5735129f56db74] | committer: Rémi Denis-Courmont

contrib: ffmpeg: do not build the concat protocol

This protocol is now proven insecure and is of no use in VLC.

(cherry picked from commit 2fc4c0c1cd05bf7814e1261f1350d3f52b3ccf1d)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=fb70035a4823a1c1d6069f746c5735129f56db74
---

 contrib/src/ffmpeg/rules.mak |    1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 0f767dc..80fdc29 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -26,6 +26,7 @@ FFMPEGCONF = \
 	--disable-devices \
 	--disable-avfilter \
 	--disable-filters \
+	--disable-protocol=concat \
 	--disable-bsfs \
 	--disable-bzlib \
 	--disable-avresample