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