cherry picked from commit 903236292f Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
903236292f