Merge pull request #15950 from alalek:ffmpeg_update_master