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