Merge pull request #7365 from thess/ffmpeg-work