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