Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit be3c29e3795cb2499e3b96335286d6a8423c0bcf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>