From c1d1ef4ecd9c4f1ca01c8149c7e57c14968ca588 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Fri, 11 Jan 2013 05:07:42 +0100
Subject: [PATCH 1/2] zmbv: Reset the decoder on keyframe errors

Prevent the crash on fuzzed files as reported in bug 63.
---
 libavcodec/zmbv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 8e0db8b531..5d4254aec0 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -428,6 +428,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
         c->fmt = buf[3];
         c->bw = buf[4];
         c->bh = buf[5];
+        c->decode_intra = NULL;
+        c->decode_xor = NULL;
 
         buf += 6;
         len -= 6;

From d11cb13b0ef02fb1c303b29805819f6e1c9dc61b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 10 Jan 2013 12:22:53 +0000
Subject: [PATCH 2/2] configure: enable pic for shared libs on AArch64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 2b1bd32562..23b4081a64 100755
--- a/configure
+++ b/configure
@@ -2782,7 +2782,7 @@ check_64bit(){
 }
 
 case "$arch" in
-    alpha|ia64)
+    aarch64|alpha|ia64)
         spic=$shared
     ;;
     mips)