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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit de714ce23a36ea09226a844a6ba9d286ee51d337
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 14:31:37 2010 -0400

    no longer disable encoders

diff --git a/debian/confflags b/debian/confflags
index 7d8efc7..c807052 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -72,19 +72,6 @@ gpl_confflags += --enable-gpl
 gpl_confflags += --enable-postproc
 gpl_confflags += --enable-x11grab
 
-# "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
-disable_encoders += --disable-encoder=mpeg4
-disable_encoders += --disable-encoder=msmpeg4v1
-disable_encoders += --disable-encoder=msmpeg4v2
-disable_encoders += --disable-encoder=msmpeg4v3
-
-# Comment out the following line to *not* disable the above encoders
-confflags += $(disable_encoders)
-
 # Common configuration flags
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --prefix=/usr

-- 
FFmpeg packaging