Fixes Ticket1633 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.10.5f0896a6bd9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit450e4b1a60) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>