cherry picked from commit e6ee89e6fa Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
e6ee89e6fa