Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 12:41:53 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 12:45:22 +0000 (13:45 +0100)
commit91ae9bc51e0f61c1c1caa2e26caf6e2add906f38
treec34e41630707dfb662797aa0b0c8fa47ec4e9d66
parentab6c9332bfa1e20127a16392a0b85a4aa4840889
parent6bdb841b46d170d58488deaed720729b79223b1d
Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'

* commit '6bdb841b46d170d58488deaed720729b79223b1d':
  arm: h264qpel: use neon h264 qpel functions only if supported

* bug was fixed previously (in merge of buggy code):
  h264: copy h264qpel dsp context to slice thread copies

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