diff -Nru libav-0.8.17/debian/changelog libav-0.8.17/debian/changelog
--- libav-0.8.17/debian/changelog	2015-03-14 22:23:27.000000000 +0000
+++ libav-0.8.17/debian/changelog	2015-03-25 00:23:12.000000000 +0000
@@ -1,3 +1,9 @@
+libav (6:0.8.17-1+rpi1) wheezy-staging; urgency=low
+
+  * Disable build of neon flavour
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 25 Mar 2015 00:22:51 +0000
+
 libav (6:0.8.17-1) wheezy-security; urgency=medium
 
   * New upstream release fixing multiple security issues.
diff -Nru libav-0.8.17/debian/confflags libav-0.8.17/debian/confflags
--- libav-0.8.17/debian/confflags	2015-03-14 20:56:49.000000000 +0000
+++ libav-0.8.17/debian/confflags	2015-03-25 00:23:12.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