[FFmpeg-cvslog] Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 23:41:12 2014 +0100| [d61e1156beae2f33aceb7c12010c1475d3e597d5] | committer: Michael Niedermayer

Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'

* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d':
  x86: Add some more missing headers

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

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