Removed assumption that any ARM build is ARMv7, fallback to ARMv6 to fix Raspberry Pi build

ffmpeg.gyp

Index: ffmpeg.gyp
diff --git a/ffmpeg.gyp b/ffmpeg.gyp
index 41e10a437efd8a371107b7cec457efc2a3462100..1c6c157cfa51e98d75cb165bb1cd0b7163117eed 100644
--- a/ffmpeg.gyp
+++ b/ffmpeg.gyp
@@ -166,7 +166,7 @@
                 '-fno-omit-frame-pointer',
               ],
             }],  # target_arch == "ia32"
-            ['target_arch == "arm"', {
+            ['target_arch == "arm" and armv7 == 1', {
               # TODO(ihf): See the long comment in build_ffmpeg.sh
               # We want to be consistent with CrOS and have configured
               # ffmpeg for thumb. Protect yourself from -marm.
@@ -192,6 +192,18 @@
                 }],
               ],
             }],
+            ['target_arch == "arm" and armv7 == 0', {

[Ami GONE FROM CHROMIUM, 2012/05/12 15:10:14]

Would this be better placed in src/build/common.gypi?  
(I'm not sure why the above ARM stanza is here, either)

+              'cflags!': [
+                '-mthumb',

[Ami GONE FROM CHROMIUM, 2012/05/14 18:22:53]

Actually I'm surprised this CL works at all, considering build_ffmpeg.sh
hard-codes thumb, armv7, cortex-a8, etc to match l.177-190.
Are we getting lucky, or is there some reason this is working that I'm not
seeing?
(are you building against ffmpeg sources other than those generated by
build_ffmpeg.sh?)

+              ],
+              'cflags': [
+                '-marm',
+                '-march=armv6j',
+                '-mtune=arm1176jzf-s',
+                '-mfloat-abi=softfp',
+		'-mfpu=vfp',
+              ],
+            }],
             ['os_posix == 1 and OS != "mac"', {
               'defines': [
                 '_ISOC99_SOURCE',