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

This reverts commit 6f3ec9885e.
This commit is contained in:
Duncaen 2016-01-16 22:07:27 +01:00
parent 231ab61591
commit 93b9810b1d

View file

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