Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from committags/n0.5.5723229c11f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commitd51c7b4cbe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>