Fixes part of Ticket5264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 67e5bd0c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>