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