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