cherry picked from commit f784335625 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
f784335625