Merge pull request #5843 from antonlacon/ffmpeg