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