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