diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-24 14:43:49 +0300 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-24 14:43:49 +0300 |
| commit | 2c47d243585a090ec90c97109a44f2a6d13d5f7c (patch) | |
| tree | d8694a2760572fc1caa2f28682c34a78f7b33b46 /libavformat/rtmpdh.h | |
| parent | 761bbb06ff591343b3e1ec141bb23cb2dfe502d0 (diff) | |
| parent | 016387fe0fe3eff1a03ec0673bf4d2967f6cad94 (diff) | |
Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'
* commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94':
rtmpdh: Don't use the OpenSSL DH struct
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/rtmpdh.h')
| -rw-r--r-- | libavformat/rtmpdh.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index 2b250f595d..188aad7a45 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -26,7 +26,6 @@ #include "config.h" -#if CONFIG_GMP || CONFIG_GCRYPT #if CONFIG_GMP #include <gmp.h> @@ -35,6 +34,12 @@ typedef mpz_ptr FFBigNum; #include <gcrypt.h> typedef gcry_mpi_t FFBigNum; + +#elif CONFIG_OPENSSL +#include <openssl/bn.h> +#include <openssl/dh.h> + +typedef BIGNUM *FFBigNum; #endif typedef struct FF_DH { @@ -45,13 +50,6 @@ typedef struct FF_DH { long length; } FF_DH; -#elif CONFIG_OPENSSL -#include <openssl/bn.h> -#include <openssl/dh.h> - -typedef BIGNUM *FFBigNum; -typedef DH FF_DH; -#endif /** * Initialize a Diffie-Hellmann context. |