[SCM] ffmpeg/master: syncronize configuration flags with Ubuntu

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43040cd3753c1374fe8491c4e7ce06e65603317f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:21:50 2011 +0100

    syncronize configuration flags with Ubuntu

diff --git a/debian/confflags b/debian/confflags
index 029a075..757b91c 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -88,8 +88,12 @@ endef
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
 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

-- 
Libav/FFmpeg packaging