[FFmpeg-cvslog] Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  5 21:26:11 2014 +0100| [146b476ba0c99a45caae8559a2e905cbbb79a35b] | committer: Michael Niedermayer

Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

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

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