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