Merge pull request #3766 from thess/ffmpeg3-update