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)
commit79928f9278e2561ff1a434db726acc2b9cb267ba
tree3e6e511fdfccb6e2b8d09c87f88ab5d63c7d1729
parent1e8829bb920d7d333fd2d3db1e6c8fe165437db5
parentc44e1d43a36343564972b48809357fa7cef3fa5c
Merge pull request #7396 from thess/ffmpeg-x264

ffmpeg: Resolve libx264, BUILD_PATENTED anomalies