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