diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-11 18:40:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-11 18:40:29 -0300 |
| commit | 9908eac218661de44fb2da65860bd987c807af17 (patch) | |
| tree | df31b7f8f817e823254e13ea08a0f6e4000b0213 /libavfilter/asrc_flite.c | |
| parent | 5adc1f14f91b762d8e7a7056e98a1ede82a58b6c (diff) | |
| parent | 3c0efbd03349ae68d3a25a082222652a102e3fd4 (diff) | |
| download | ffmpeg-9908eac218661de44fb2da65860bd987c807af17.tar.gz | |
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@gmail.com>
Diffstat (limited to 'libavfilter/asrc_flite.c')
0 files changed, 0 insertions, 0 deletions