Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:53:19 +0000 (16:53 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:53:19 +0000 (16:53 -0300)
* commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c':
  build: CryptGenRandom --> wincrypt, it is a better name

Merged-by: James Almer <jamrial@gmail.com>
configure
libavutil/random_seed.c

index ca5fe7153fe896d62538fc37cacfbb0efe295cc5..5461f42c9db64d6265786db2ae0e8d4fc9c82091 100755 (executable)
--- a/configure
+++ b/configure
@@ -1992,7 +1992,6 @@ SYSTEM_FUNCS="
     clock_gettime
     closesocket
     CommandLineToArgvW
-    CryptGenRandom
     fcntl
     getaddrinfo
     gethrtime
@@ -2113,6 +2112,7 @@ HAVE_LIST="
     vaapi_x11
     vdpau_x11
     winrt
+    wincrypt
 "
 
 # options emitted with CONFIG_ prefix but not available on the command line
index d1c9a3f7046d7efada2e11194819e113ab0f6bb7..881c23c8c81c2b91ff69521247a4219eb1feebb5 100644 (file)
@@ -26,7 +26,7 @@
 #if HAVE_IO_H
 #include <io.h>
 #endif
-#if HAVE_CRYPTGENRANDOM
+#if HAVE_WINCRYPT
 #include <windows.h>
 #include <wincrypt.h>
 #endif
@@ -121,7 +121,7 @@ uint32_t av_get_random_seed(void)
 {
     uint32_t seed;
 
-#if HAVE_CRYPTGENRANDOM
+#if HAVE_WINCRYPT
     HCRYPTPROV provider;
     if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
                             CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {