Revert "ffmpeg: disable concat and hls CVE-2016-1897, CVE-2016-1898"

This reverts commit 6f3ec9885e.

srcpkgs/ffmpeg/template

@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=2.8.5
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
@@ -52,7 +52,7 @@ do_configure() {
 		$(vopt_if x265 '--enable-libx265' '--disable-libx265') \
 		$(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \
 		$(vopt_enable vaapi) $(vopt_enable vdpau) \
-		--enable-libbs2b --disable-demuxer='hls' --disable-protocol='concat,hls'
+		--enable-libbs2b
 }
 do_build() {
 	rm ${XBPS_WRAPPERDIR}/strip