improved mp4 handling