Merge pull request #11485 from BKPepe/x264
authorRosen Penev <rosenp@gmail.com>
Sun, 15 Mar 2020 18:55:33 +0000 (11:55 -0700)
committerGitHub <noreply@github.com>
Sun, 15 Mar 2020 18:55:33 +0000 (11:55 -0700)
x264: add CONFIGURE_VARS when NASM is not selected


Trivial merge