Fixes part of mozilla bug 1229167

Found-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e7f4520)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>