[SCM] ffmpeg/master.snapshot: Drop -marm; obsolete

[lool at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit cd22fd4f30f81fc1d2fe789f2c0265a21f96c0a5
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Oct 5 11:37:08 2010 +0200

    Drop -marm; obsolete
    
    Stop adding -marm to --extra-cflags as this is useless since upstream
    r20144.

diff --git a/debian/confflags b/debian/confflags
index bb178f3..9d6103b 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -117,11 +117,6 @@ ifeq      ($(DEB_HOST_ARCH),ia64)
 confflags += --disable-decoder=aac --disable-encoder=aac
 endif
 
-ifeq      ($(DEB_HOST_ARCH_CPU),arm)
-# 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
-confflags += --extra-cflags="-marm"
-endif
 confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse

-- 
FFmpeg packaging