[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-1-2-g7c7b17c

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 7c7b17c283201068efe9d69a1edde5df8e100059
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jun 18 09:50:08 2010 +0200

    Disable aac encoder, see README.Debian.

diff --git a/debian/confflags b/debian/confflags
index 90cbe00..20929da 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -71,6 +71,7 @@ gpl_confflags += --enable-x11grab
 gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 
 # "forbidden" encoders, see README.Debian for details
+disable_encoders += --disable-encoder=aac
 disable_encoders += --disable-encoder=h263
 disable_encoders += --disable-encoder=h263p
 disable_encoders += --disable-encoder=mpeg2video

-- 
FFmpeg packaging