diff -Nru libav-10.1/debian/changelog libav-10.1/debian/changelog
--- libav-10.1/debian/changelog	2014-05-11 16:31:13.000000000 +0000
+++ libav-10.1/debian/changelog	2014-06-23 11:57:10.000000000 +0000
@@ -1,3 +1,9 @@
+libav (6:10.1-1+arm641) unreleased; urgency=medium
+
+  * Apply upstream patch to fix build on aarch64 with neon and pic.
+
+ -- Peter Michael Green <plugwash@debian.org>  Mon, 23 Jun 2014 11:56:46 +0000
+
 libav (6:10.1-1) unstable; urgency=low
 
   * New upstream release 10:
diff -Nru libav-10.1/debian/patches/fix-aarch64-pic.patch libav-10.1/debian/patches/fix-aarch64-pic.patch
--- libav-10.1/debian/patches/fix-aarch64-pic.patch	1970-01-01 00:00:00.000000000 +0000
+++ libav-10.1/debian/patches/fix-aarch64-pic.patch	2014-06-23 11:56:03.000000000 +0000
@@ -0,0 +1,33 @@
+From: Martin Storsjö <martin@martin.st>
+Date: Thu, 29 May 2014 11:37:31 +0000 (+0300)
+Subject: aarch64: Use the correct syntax for relocations
+X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=34fb994d9340313b0d247899a4a7a97cc010df92;hp=e780c3daafe0588e035e752c771ebfcd2201746a
+
+aarch64: Use the correct syntax for relocations
+
+This fixes building in PIC mode with gas. The examples in the gas
+manual showed using a # here even though gas itself actually didn't
+support that syntax (and the gas test suite only tests it without
+the extra hash sign).
+
+CC: libav-stable@libav.org
+Signed-off-by: Martin Storsjö <martin@martin.st>
+(cherry picked from commit 08cd92144e73195eecc28ed0348e66e255516b82)
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+
+diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
+index 94e5a84..6608472 100644
+--- a/libavutil/aarch64/asm.S
++++ b/libavutil/aarch64/asm.S
+@@ -55,8 +55,8 @@ ELF     .size   \name, . - \name
+ 
+ .macro  movrel rd, val
+ #if CONFIG_PIC
+-        adrp            \rd, #:pg_hi21:\val
+-        add             \rd, \rd, #:lo12:\val
++        adrp            \rd, :pg_hi21:\val
++        add             \rd, \rd, :lo12:\val
+ #else
+         ldr             \rd, =\val
+ #endif
diff -Nru libav-10.1/debian/patches/series libav-10.1/debian/patches/series
--- libav-10.1/debian/patches/series	2014-05-11 16:31:13.000000000 +0000
+++ libav-10.1/debian/patches/series	2014-06-23 11:55:02.000000000 +0000
@@ -1 +1,2 @@
 03-disable-configuration-warnings.patch
+fix-aarch64-pic.patch
