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