Merge commit '8b411918'

* commit '8b411918':
  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>