This basically switches to the implementation from f6f7d150
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>