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