Fixes out of array reads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9bff052b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>