[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-5-10-g6bca5a6

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6bca5a6be439a3a5b461ce8117824becac1b49be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 20:00:20 2010 +0100

    Revert "enable cpu autodetection in libswscale, Closes: #567725. LP: #386397"
    
    No longer necessary with backported patch.
    
    This reverts commit cf5a7e07c9d6fe668bb8276b49788a7b5ee68407.

diff --git a/debian/rules b/debian/rules
index d56d338..5cd3676 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,6 @@ configure-stamp-%: $(QUILT_STAMPFN)
 		cp .svnrevision debian-$*/snapshot_version
 	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
-# cf. #567725
-	sed -i 's,^#endif.*,#define CONFIG_RUNTIME_CPUDETECT 1\n#endif,' \
-		debian-$*/config.h
 	touch $@
 
 build-%: build-stamp-%

-- 
FFmpeg packaging