Hi!

Attached patch should not change decoder behaviour, it is only meant
to simplify the second patch.

Please comment, Carl Eugen