Merge pull request #7396 from thess/ffmpeg-x264
authorTed Hess <thess@kitschensync.net>
Sun, 11 Nov 2018 22:17:05 +0000 (17:17 -0500)
committerGitHub <noreply@github.com>
Sun, 11 Nov 2018 22:17:05 +0000 (17:17 -0500)
ffmpeg: Resolve libx264, BUILD_PATENTED anomalies


Trivial merge