diff -Nru libav-0.8.16/debian/changelog libav-0.8.16/debian/changelog
--- libav-0.8.16/debian/changelog	2014-09-17 02:57:53.000000000 +0000
+++ libav-0.8.16/debian/changelog	2015-01-11 23:18:35.000000000 +0000
@@ -1,3 +1,9 @@
+libav (6:0.8.16-1+rpi1) wheezy-staging; urgency=low
+
+  * Disable build of neon flavour
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 11 Jan 2015 23:18:05 +0000
+
 libav (6:0.8.16-1) stable-security; urgency=low
 
   * Imported Upstream version 0.8.16, new releases fixes:
diff -Nru libav-0.8.16/debian/confflags libav-0.8.16/debian/confflags
--- libav-0.8.16/debian/confflags	2014-09-17 01:42:34.000000000 +0000
+++ libav-0.8.16/debian/confflags	2015-01-11 23:18:35.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