[FFmpeg-cvslog] Merge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 21:10:27 2015 +0100| [6a28ae55c4fea975c09a3474ca5a55ca4134a4e9] | committer: Michael Niedermayer

Merge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10

* commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d':
  arm: dsputil: prettify some conditional instructions in put_pixels macros

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

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