Fixes ticket #1874 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ca2818b881)
ca2818b881