Merge pull request #5843 from antonlacon/ffmpeg
authorTed Hess <redacted>
Tue, 3 Apr 2018 18:45:06 +0000 (14:45 -0400)
committerGitHub <redacted>
Tue, 3 Apr 2018 18:45:06 +0000 (14:45 -0400)
ffmpeg: fixup for patent related changes


Trivial merge
git clone https://git.99rst.org/PROJECT