Fixes Ticket4621 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 57078e4d25)
57078e4d25