This looks like a significant change. Are we sure this won't break the normal buffered operation, e.g. with plain mp4 playback?