This reduces the number of cases where timestamps need to be shifted

Fixes Ticket4487
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>