Merge pull request #3128 from dangowrt/x264-without-yasm
authorTed Hess <thess@kitschensync.net>
Sat, 3 Sep 2016 13:21:55 +0000 (09:21 -0400)
committerGitHub <noreply@github.com>
Sat, 3 Sep 2016 13:21:55 +0000 (09:21 -0400)
libx264: allow building with yasm


Trivial merge