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


Trivial merge