Fixes Ticket1718 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.10.593b240f4a5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit3581ab6ce0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>