See: Ticket5508 Suggested-by: Carl Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e5d434b840404d84585456e51755e052a0fe0731)