Hopefully final fix for dts/pts calculation