Merge commit '8b4119187b62d6932e07aded11d33d3b24e1b42f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 03:59:20 +0000 (04:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 04:10:19 +0000 (05:10 +0100)
* commit '8b4119187b62d6932e07aded11d33d3b24e1b42f':
  cabac: remove leftovers from the cabac encoder

Not merged, as we have not removed the cabac test which uses these

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

Trivial merge