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