[SCM] ffmpeg/master: libfaad wrapper has been removed upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a5b847b19f92cd19bb0a5ae82d0a5d8b0d8829cc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:33:52 2011 +0200

    libfaad wrapper has been removed upstream

diff --git a/debian/confflags b/debian/confflags
index 12573b1..f3df6fb 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -91,9 +91,6 @@ gpl_confflags += --enable-postproc
 gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
-# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
-gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
-
 # Common configuration flags
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --prefix=/usr
@@ -125,7 +122,6 @@ confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
-gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
diff --git a/debian/control b/debian/control
index b0096f0..c1078c8 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 7),
  libbz2-dev,
  libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libdirac-dev,
- libfaad-dev | libfaad2-dev,
  libfreetype6-dev,
  libgsm1-dev,
  libimlib2-dev,

-- 
Libav/FFmpeg packaging