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