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)
commitf137d5763dbaf352bef6453ac0dcc16c1248137c
tree5b214bb56fb5b39d73699b4a5434d3579dddee41
parent6fc064893270be7549eccc78fd085ca8521ad9f2
parentd11cb13b0ef02fb1c303b29805819f6e1c9dc61b
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>
configure
libavcodec/zmbv.c