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