[SCM] ffmpeg/experimental: Do not build with -enable-libvo_aacenc

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a0439d6299ff59d39716d9872e65fd544a58b029
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Mar 7 01:38:43 2016 +0100

    Do not build with -enable-libvo_aacenc

diff --git a/debian/control b/debian/control
index 4678322..b69804e 100644
--- a/debian/control
+++ b/debian/control
@@ -116,8 +116,6 @@ Build-Depends:
  libva-dev [!hurd-any],
 # autodetected: hwaccels 'h263_vdpau, mpeg2_vdpau, vc1_vdpau, h264_vdpau, mpeg4_vdpau, wmv3_vdpau, mpeg1_vdpau', decoders 'h264_vdpau, mpeg1_vdpau, mpeg4_vdpau, mpeg_vdpau, vc1_vdpau, wmv3_vdpau'
  libvdpau-dev,
-# --enable-libvo_aacenc
- libvo-aacenc-dev,
 # --enable-libvo_amrwbenc
  libvo-amrwbenc-dev,
 # --enable-libvorbis
diff --git a/debian/rules b/debian/rules
index 92baa10..9409171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,7 +120,6 @@ CONFIG_extra = --enable-version3 \
 	--disable-swscale \
 	--enable-libopencore_amrnb \
 	--enable-libopencore_amrwb \
-	--enable-libvo_aacenc \
 	--enable-libvo_amrwbenc
 
 # Disable optimizations if requested.

-- 
ffmpeg packaging