Added better video file stream handling