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