Fixes Ticket 5115
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5c8467a0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>