diff -Nru libav-0.8.4/debian/changelog libav-0.8.4/debian/changelog
--- libav-0.8.4/debian/changelog	2012-10-22 20:32:22.000000000 +0100
+++ libav-0.8.4/debian/changelog	2012-11-05 19:55:46.000000000 +0000
@@ -1,3 +1,9 @@
+libav (6:0.8.4-1+rpi1) wheezy-staging; urgency=low
+
+  * Disable build of neon flavour
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 05 Nov 2012 19:55:23 +0000
+
 libav (6:0.8.4-1) unstable; urgency=low
 
   * New upstream security/bugfix release. New release fixes:
diff -Nru libav-0.8.4/debian/confflags libav-0.8.4/debian/confflags
--- libav-0.8.4/debian/confflags	2012-10-22 19:51:25.000000000 +0100
+++ libav-0.8.4/debian/confflags	2012-11-05 19:52:17.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