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)
commit3733cea38965c2e4a77b7f84a00f72fb067c2401
tree5802487911d50d531984ca53033f5c0736a0460b
parenta9d0802bd4d741c5405ebe97f3fd614a8359b61c
parent50b76be7487ab1efe96775e24eafe1cda65e4fec
Merge pull request #5843 from antonlacon/ffmpeg

ffmpeg: fixup for patent related changes