Merge pull request #17719 from BKPepe/ffmpeg-update