Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 12:37:38 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 12:38:37 +0000 (13:38 +0100)
* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/zmbv.c

index 576905c..889b186 100755 (executable)
--- a/configure
+++ b/configure
@@ -3076,7 +3076,7 @@ check_64bit(){
 }
 
 case "$arch" in
-    alpha|ia64)
+    aarch64|alpha|ia64)
         spic=$shared
     ;;
     mips)
index a2d804a..03821cd 100644 (file)
@@ -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;