Merge pull request #7378 from thess/ffmpeg-custom