[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 02e80f5fa58b64a99488580e25c29327174376d6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 14:34:02 2010 -0400

    disable AAC decoder and encoder on ia64
    
    for mysterical reasons, the aac decoder seem to cause the bss segment
    to grow to big on ia64, disable it until the toolchain gets fixed

diff --git a/debian/confflags b/debian/confflags
index c807052..ca3b3cd 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -92,6 +92,13 @@ confflags += --enable-zlib
 confflags += --enable-libvpx
 confflags += --disable-stripping
 confflags += --enable-runtime-cpudetect
+
+# for mysterical reasons, the aac decoder seem to cause the bss segment
+# to grow to big on ia64, disable it until the toolchain gets fixed
+ifeq      ($(DEB_HOST_ARCH),ia64)
+confflags += --disable-decoder=aac --disable-encoder=aac
+endif
+
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
 # plenty of incompatible assembly; not sure how to detect that properly

-- 
FFmpeg packaging