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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  5 21:34:08 2014 +0100| [a74bab7079d7a6d0a6c7859dcc35365c32795674] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm

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

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