[FFmpeg-cvslog] Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  5 19:04:56 2014 +0200| [874f27a8f7e3ca2169c28746173c0a92659beb9c] | committer: Michael Niedermayer

Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

* commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647':
  x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes

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

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