Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d23e8f53ad01fde6d0dd96644c2a594f8dd7537e)