[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 11:14:10 2013 +0200| [1a7ae6be2a8722d0a496acb11963e9540d7494d3] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Include hpeldsp_neon.o if h264qpel is enabled

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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