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