[FFmpeg-cvslog] Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 18:24:56 2014 +0100| [5e5d8ace8a7f58f702ec756b0909bd2ab27bd929] | committer: Michael Niedermayer

Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'

* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
  arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

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

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