This reverts commit d30cf57a, reversing changes made to
acc155ac. The commit d30cf57a
provided irrelevant code complexity and decoding slowdown. But the main disadvantage of this
commit is a decoder crash. So it should be reverted.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>