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