Merge pull request #11737 from antonlacon/ffmpeg-4.2
authorRosen Penev <rosenp@gmail.com>
Wed, 29 Apr 2020 04:03:57 +0000 (21:03 -0700)
committerGitHub <noreply@github.com>
Wed, 29 Apr 2020 04:03:57 +0000 (21:03 -0700)
ffmpeg: update to 4.2.2


Trivial merge