Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 429de043)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>