Previous code didn't actually behave so well with small keyints etc.
(cherry picked from commit f1e222cf3197da2a0c395b5a8eae745e470d312e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>