[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-2-2-ga041665

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b25e5c73bfd082cf4b8d9e5fb95bcce6b68bef54
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Aug 10 09:05:54 2009 +0200

    AAC is considered non-free upstream, disable it for now

diff --git a/debian/confflags b/debian/confflags
index 37711c2..67c0fad 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -87,9 +87,11 @@ confflags += $(extra_common_confflags)
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
-confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
 
+# AAC is considered non-free upstream, disable it for now
+# confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
+
 # comment out following line for LGPL versions of the libraries
 confflags += $(gpl_confflags)
 

-- 
FFmpeg packaging