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