Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 596636a4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>