Merge pull request #8116 from antonlacon/ffmpeg-next