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