4a479fd3e6
Fixes Ticket 3542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 291d464161)