[FFmpeg-cvslog] Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:12:06 2014 +0100| [3775224b2f8a9c2c0bf5d53272236d4a1ffb0875] | committer: Michael Niedermayer

Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
  dsputil: Conditionally compile dsputil code on all architectures

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

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