[FFmpeg-cvslog] Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 25 13:41:53 2013 +0100| [91ae9bc51e0f61c1c1caa2e26caf6e2add906f38] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91ae9bc51e0f61c1c1caa2e26caf6e2add906f38
---