From 93b9810b1d514a30bf684acd278a49f3221fb098 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Sat, 16 Jan 2016 22:07:27 +0100
Subject: [PATCH] Revert "ffmpeg: disable concat and hls CVE-2016-1897,
 CVE-2016-1898"

This reverts commit 6f3ec9885ec099103810e78d37c66d95fd27f2a6.
---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 729f8c73217..ba0762b2b46 100644
--- a/srcpkgs/ffmpeg/template
+++ b/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