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>
1  2 
configure
libavcodec/zmbv.c

diff --cc configure
Simple merge
Simple merge