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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cf5a7e07c9d6fe668bb8276b49788a7b5ee68407
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 19:42:03 2010 +0100

    enable cpu autodetection in libswscale, Closes: #567725. LP: #386397
    
    this hack is required because ffmpeg's configure does not set this in
    0.5. It is however in use by mplayer's configure script. As suggested by
    Raimar Döffinger, this gets now hardcoded in the generated config.h

diff --git a/debian/rules b/debian/rules
index 5cd3676..d56d338 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,9 @@ 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