Merge pull request #5843 from antonlacon/ffmpeg
authorTed Hess <thess@kitschensync.net>
Tue, 3 Apr 2018 18:45:06 +0000 (14:45 -0400)
committerGitHub <noreply@github.com>
Tue, 3 Apr 2018 18:45:06 +0000 (14:45 -0400)
ffmpeg: fixup for patent related changes


Trivial merge