Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.5.5a4ed7c3fe9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit67c46b9b30) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>