Fixes Ticket1629 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.10.53d7817048c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit9f1e01c991) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>