Also it gets rid of some mysterious magic numbers in code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 187e2347)