Fixes part of ticket 5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 37005e65)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>