[SCM] handbrake/master: Revert "enable fdk-aac support"

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c7e9dfefa54d2126c0bb8a8c989c342a9b44bfd7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 15:50:29 2014 +0000

    Revert "enable fdk-aac support"
    
    This reverts commit 3977a9aa05b0174bba4bb8de316c3c68ad4dc061.
    
    libfdk-aac-dev is in debian/non-free because of uncertainities regarding
    the license, cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694257#60

diff --git a/debian/control b/debian/control
index f59275e..b67c012 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,6 @@ Build-Depends:
  libdca-dev,
  libdvdnav-dev (>= 4.2.0+20120524),
  libdvdread-dev (>= 4.2.0+20120521),
- libfdk-aac-dev,
  libfontconfig1-dev,
  libfreetype6-dev,
  libgstreamer-plugins-base1.0-dev,
diff --git a/debian/rules b/debian/rules
index ab81dc3..400891a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ override_dh_auto_configure:
 		--disable-libmkv \
 	        --disable-faac \
 		--disable-mp4v2 \
+		--disable-fdk-aac \
 		CC="$(CC)" CXX="$(CXX)" \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 

-- 
handbrake packaging