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

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

The following commit has been merged in the master branch:
commit 27cfe82ab6f6597a266b2d456cfd894e63281070
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 15:56:37 2009 -0400

    Don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS.

diff --git a/debian/confflags b/debian/confflags
index 4d08e01..67249db 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -59,10 +59,8 @@ disable_encoders += --disable-encoder=msmpeg4v1
 disable_encoders += --disable-encoder=msmpeg4v2
 disable_encoders += --disable-encoder=msmpeg4v3
 
-# disabling the next three lines might enable some additional encoders,
-# not in debian at this point, as we munge the source there as well,
-# though
-ifeq ($(DEB_SOURCE),ffmpeg-debian)
+# don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
+ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
 confflags += $(disable_encoders)
 endif
 

-- 
FFmpeg packaging