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