diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-01 18:45:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-01 18:45:23 -0300 |
| commit | 070336b89b0b7321f31f68dc1e430f85fa188e83 (patch) | |
| tree | 7f6cda0b8ed6dfadbb1372af04afc7ffc4539887 /libavutil/eval.c | |
| parent | 42a9722a5c48c3889764de3af68d9afc6d627f61 (diff) | |
| parent | ed434be106a4615e0419b3ac7664220741afda2d (diff) | |
| download | ffmpeg-070336b89b0b7321f31f68dc1e430f85fa188e83.tar.gz | |
Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d'
* commit 'ed434be106a4615e0419b3ac7664220741afda2d':
configure: Bail out if both GnuTLS and OpenSSL are enabled
configure: Move x86 assembler sanity check into assembler probe function
build: Add missing zlib dependencies for several protocols
This commit is a noop, see
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
5cae5a1defa360da076365a786093a749d1ddf4e
4600b0619afc58b58de1a21d7a2c472e0d788282
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/eval.c')
0 files changed, 0 insertions, 0 deletions