Fixes Ticket 4167
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2d0117f8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>