Merge commit 'a8956eca1ff3b5b7f9aadbe6eb46536efeb2f828'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:56:14 +0000 (09:56 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:56:14 +0000 (09:56 +0200)
* commit 'a8956eca1ff3b5b7f9aadbe6eb46536efeb2f828':
  cabac: Make CABAC states hardcoded

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge