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