Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 72261fa8675ca6e118efe202fcb13fd0866d4a54) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>