Merge pull request #4915 from antonlacon/ffmpeg-next