diff -Nru libav-0.8.21/debian/changelog libav-0.8.21/debian/changelog
--- libav-0.8.21/debian/changelog	2017-10-16 15:22:05.000000000 +0000
+++ libav-0.8.21/debian/changelog	2017-10-26 13:47:41.000000000 +0000
@@ -1,3 +1,10 @@
+libav (6:0.8.21-0+deb7u1+rpi1) wheezy-staging; urgency=medium
+
+  [changes brought forward from 6:0.8.17-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 25 Mar 2015 00:22:51 +0000]
+  * Disable build of neon flavour
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Oct 2017 13:47:41 +0000
+
 libav (6:0.8.21-0+deb7u1) wheezy-security; urgency=high
 
   * Non-maintainer upload by the LTS Team.
diff -Nru libav-0.8.21/debian/confflags libav-0.8.21/debian/confflags
--- libav-0.8.21/debian/confflags	2016-03-02 22:16:19.000000000 +0000
+++ libav-0.8.21/debian/confflags	2017-10-26 13:47:41.000000000 +0000
@@ -47,7 +47,8 @@
     endif
     # only build a NEON flavour if the toolchain doesn't enable NEON by default
     ifneq ($(has_neon),1)
-    FLAVORS += neon
+    #RPI -- don't build neon flavour
+    #FLAVORS += neon
     endif
     # calling-conventions for VFP and NEON flavours: if the toolchain uses
     # -mfloat-abi=soft, we want to use softfp, otherwise we want to use the