Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 09:29:01 +0000 (11:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 09:29:05 +0000 (11:29 +0200)
* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
  rtmpdh: Use GMP functions directly, instead of nettle wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/rtmpdh.c
libavformat/rtmpdh.h

diff --cc configure
+++ b/configure
@@@ -1893,8 -1589,8 +1893,9 @@@ CONFIG_EXTRA=
      faanidct
      fdctdsp
      fmtconvert
 +    frame_thread_encoder
      gcrypt
+     gmp
      golomb
      gplv3
      h263dsp
@@@ -2615,9 -2183,8 +2615,9 @@@ x11grab_indev_deps="x11grab
  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"
@@@ -5201,10 -4334,9 +5201,10 @@@ enabled openssl           && { check_li
                                 check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
                                 die "ERROR: openssl not found"; }
 +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
  
Simple merge
Simple merge