configure: Add check_x86asm() helper function to simplify some expressions

[ffmpeg] / libavformat / rtmpdh.h

diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h
index 21ad13ea16b2f17c8e3ef2be193aae82ae4ffc33..b4d6121d85292df531db39142e3a3c9c69b84b40 100644 (file)
--- a/libavformat/rtmpdh.h
+++ b/libavformat/rtmpdh.h
@@ -22,18 +22,19 @@
 #ifndef AVFORMAT_RTMPDH_H
 #define AVFORMAT_RTMPDH_H
 
-#include "avformat.h"
+#include <stdint.h>
+
 #include "config.h"
 
-#if CONFIG_GMP || CONFIG_GCRYPT
 #if CONFIG_GMP
 #include <gmp.h>
 
 typedef mpz_ptr FFBigNum;
-#elif CONFIG_GCRYPT
-#include <gcrypt.h>
+#elif CONFIG_OPENSSL
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
-typedef gcry_mpi_t FFBigNum;
+typedef BIGNUM *FFBigNum;
 #endif
 
 typedef struct FF_DH {
@@ -44,13 +45,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.