[FFmpeg-cvslog] Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 11 18:40:29 2017 -0300| [9908eac218661de44fb2da65860bd987c807af17] | committer: James Almer

Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'

* commit '3c0efbd03349ae68d3a25a082222652a102e3fd4':
  build: Allow generating dependencies as a side-effect of assembling
  build: Generalize yasm/nasm-related variable names

This commit is a noop, see
fd502f4f5fe8d2f241102ca9a529aa7f88209c22
0cc0c5b6dbf187f9c096de03d999da040197ffe6

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9908eac218661de44fb2da65860bd987c807af17
---