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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7ab681e16ab220709b4ae6e1162d140d32b5b6ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 13:36:56 2009 +0200

    don't disable ffserver in various optimized variants
    
    patch cherrypicked from ubuntu branch

diff --git a/debian/confflags b/debian/confflags
index 49f982d..7de3377 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -161,7 +161,6 @@ cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
 cmov_build_confflags += --disable-ffmpeg
-cmov_build_confflags += --disable-ffserver
 cmov_build_confflags += --disable-ffplay
 
 ## powerpc architecture specific
@@ -174,7 +173,6 @@ altivec_build_confflags += --disable-static
 altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
 altivec_build_confflags += --enable-altivec
 altivec_build_confflags += --disable-ffmpeg
-altivec_build_confflags += --disable-ffserver
 altivec_build_confflags += --disable-ffplay
 
 ## sparc architecture specific
@@ -186,7 +184,6 @@ vis_build_confflags += --enable-shared
 vis_build_confflags += --disable-static
 vis_build_confflags += --extra-cflags="-fPIC -DPIC"
 vis_build_confflags += --disable-ffmpeg
-vis_build_confflags += --disable-ffserver
 vis_build_confflags += --disable-ffplay
 
 # Additional documentation for PowerPC

-- 
FFmpeg packaging