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