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