V.07.1: Merge upstream, delete ffmpeg