diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 11:29:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 11:29:05 +0200 |
| commit | 589d39c768f74d97ff5be9cedbaaac00aa240c6d (patch) | |
| tree | 1353c9c339692a69538e13c1947d9304ac2ba527 /configure | |
| parent | 8939667b7087c71067a005b8473ded0e47c74259 (diff) | |
| parent | 63ce9fd23cfa5ac0d9a862be0da138108dc1c505 (diff) | |
| download | ffmpeg-589d39c768f74d97ff5be9cedbaaac00aa240c6d.tar.gz | |
Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'
* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
rtmpdh: Use GMP functions directly, instead of nettle wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1895,6 +1895,7 @@ CONFIG_EXTRA=" fmtconvert frame_thread_encoder gcrypt + gmp golomb gplv3 h263dsp @@ -1921,7 +1922,6 @@ CONFIG_EXTRA=" mpegaudiodsp mpegvideo mpegvideoenc - nettle pixblockdsp qpeldsp qsv @@ -2617,7 +2617,7 @@ x11grab_xcb_indev_deps="libxcb" # protocols bluray_protocol_deps="libbluray" ffrtmpcrypt_protocol_deps="!librtmp_protocol" -ffrtmpcrypt_protocol_deps_any="gcrypt nettle openssl" +ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl" ffrtmpcrypt_protocol_select="tcp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_select="http_protocol" @@ -5204,7 +5204,7 @@ enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -l enabled qtkit_indev && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; } if enabled gnutls; then - { check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } || + { check_lib2 gmp.h mpz_export -lgmp && enable gmp; } || { check_lib gcrypt.h gcry_mpi_new -lgcrypt && enable gcrypt; } fi |