Fixes: Invalid shifts
Fixes: #8140
Fixes: #8146
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d48e5101)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>