Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:26:11 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:33:44 +0000 (21:33 +0100)
commit146b476ba0c99a45caae8559a2e905cbbb79a35b
tree6cae9335386eb8c3af5f22c49b1c4429b094b308
parent12b97dd375736c332989c50ea68af9d834b2621f
parent3741aa37c2a0d0717faff74a5c4cc357d16f6d1d
Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/cabac.h