Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e8931d79)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>