Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 3 insertions, 1 deletions

diff --git a/configure b/configure
index 576905c970..889b186bff 100755
--- a/configure
+++ b/configure
@@ -3076,7 +3076,7 @@ check_64bit(){
 }
 
 case "$arch" in
-    alpha|ia64)
+    aarch64|alpha|ia64)
         spic=$shared
     ;;
     mips)
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index a2d804a90c..03821cde9e 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -429,6 +429,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;