Merge pull request #11737 from antonlacon/ffmpeg-4.2