Final set of changes for a working ffmpeg.