diff -Nru libav-0.8.17/debian/changelog libav-0.8.17/debian/changelog
--- libav-0.8.17/debian/changelog	2016-06-14 12:14:16.000000000 +0000
+++ libav-0.8.17/debian/changelog	2016-06-17 23:37:24.000000000 +0000
@@ -1,3 +1,10 @@
+libav (6:0.8.17-2+rpi1+deb7u2) 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>  Fri, 17 Jun 2016 23:37:24 +0000
+
 libav (6:0.8.17-2+deb7u2) wheezy-security; urgency=high
 
   * CVE-2016-3062: Fix a memory corruption issue when parsing .mp4
diff -Nru libav-0.8.17/debian/confflags libav-0.8.17/debian/confflags
--- libav-0.8.17/debian/confflags	2016-03-02 22:16:19.000000000 +0000
+++ libav-0.8.17/debian/confflags	2016-06-17 23:37:24.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