Merge pull request #3554 from thess/x264-test
authorTed Hess <thess@kitschensync.net>
Thu, 8 Dec 2016 20:25:42 +0000 (15:25 -0500)
committerGitHub <noreply@github.com>
Thu, 8 Dec 2016 20:25:42 +0000 (15:25 -0500)
libx264: Add AMD Geode and i486 to ASM blacklist, fix CPU type test


Trivial merge