diff -Nru libav-0.8.2/debian/changelog libav-0.8.2/debian/changelog
--- libav-0.8.2/debian/changelog	2012-05-05 12:18:14.000000000 +0100
+++ libav-0.8.2/debian/changelog	2012-05-18 15:30:54.000000000 +0100
@@ -1,3 +1,9 @@
+libav (6:0.8.2-1+rpi1) unstable; urgency=low
+
+  * Disable build of neon flavour
+
+ -- Peter Michael Green <plugwash@p10link.net>  Fri, 18 May 2012 14:30:08 +0000
+
 libav (6:0.8.2-1) unstable; urgency=medium
 
   * New upstream release:
diff -Nru libav-0.8.2/debian/confflags libav-0.8.2/debian/confflags
--- libav-0.8.2/debian/confflags	2012-05-05 10:01:33.000000000 +0100
+++ libav-0.8.2/debian/confflags	2012-05-18 15:33:42.000000000 +0100
@@ -50,7 +50,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