[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-1-6-gf90dd6a

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

The following commit has been merged in the master branch:
commit f90dd6a5220627c4956bc44d46981bab7930144a
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Aug 26 10:51:34 2009 +0200

    Initialize the FLAVORS variable to static instead of appending to it. Also, we do not support the internalencoders variable anymore.

diff --git a/debian/confflags b/debian/confflags
index aafd88b..b416a01 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -1,8 +1,8 @@
 # -*- mode: makefile -*-
 # vim:syntax=make
-#
+
 # build a static version on every architecture in the 'debian' ffmpeg package
-FLAVORS += static
+FLAVORS := static
 
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS += shared
@@ -60,10 +60,8 @@ disable_encoders += --disable-encoder=msmpeg4v1
 disable_encoders += --disable-encoder=msmpeg4v2
 disable_encoders += --disable-encoder=msmpeg4v3
 
-# don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
-ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
+# Comment out the following line to *not* disable the above encoders
 confflags += $(disable_encoders)
-endif
 
 # Common configuration flags
 confflags += --extra-version='$(DEB_VERSION)'

-- 
FFmpeg packaging