--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
@@ -85,6 +85,17 @@
     HOST_ARCH=x64
     JOBS=$(grep processor /proc/cpuinfo | wc -l)
     ;;
+Linux\ arm*)
+    HOST_OS=linux	
+    HOST_ARCH=arm
+    if (grep neon /proc/cpuinfo)
+    then
+        TARGET_ARCH=arm-neon
+    else
+        TARGET_ARCH=arm
+    fi
+    JOBS=$(grep processor /proc/cpuinfo | wc -l)
+	;;
   Darwin\ i386)
     HOST_OS=mac
     HOST_ARCH=ia32
@@ -292,6 +303,8 @@
     add_flag_common --extra-cflags=-m32
     add_flag_common --extra-ldflags=-m32
   elif [ "$TARGET_ARCH" = "arm" ]; then
+
+  if [ "$HOST_ARCH" != "arm" ]; then
     # This if-statement essentially is for chroot tegra2.
     add_flag_common --enable-cross-compile
 
@@ -300,6 +313,7 @@
     add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
     add_flag_common --target-os=linux
     add_flag_common --arch=arm
+  fi
 
     # TODO(ihf): ARM compile flags are tricky. The final options
     # overriding everything live in chroot /build/*/etc/make.conf
@@ -323,10 +337,12 @@
     add_flag_common --extra-cflags=-mfloat-abi=hard
   elif [ "$TARGET_ARCH" = "arm-neon" ]; then
     # This if-statement is for chroot arm-generic.
+  if [ "$HOST_ARCH" != "arm" ]; then
     add_flag_common --enable-cross-compile
     add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
     add_flag_common --target-os=linux
     add_flag_common --arch=arm
+  fi
     add_flag_common --enable-armv6
     add_flag_common --enable-armv6t2
     add_flag_common --enable-vfp