mirror of https://git.videolan.org/git/ffmpeg.git
Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'
* commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c': build: CryptGenRandom --> wincrypt, it is a better name Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
3f27200954
|
@ -1992,7 +1992,6 @@ SYSTEM_FUNCS="
|
||||||
clock_gettime
|
clock_gettime
|
||||||
closesocket
|
closesocket
|
||||||
CommandLineToArgvW
|
CommandLineToArgvW
|
||||||
CryptGenRandom
|
|
||||||
fcntl
|
fcntl
|
||||||
getaddrinfo
|
getaddrinfo
|
||||||
gethrtime
|
gethrtime
|
||||||
|
@ -2113,6 +2112,7 @@ HAVE_LIST="
|
||||||
vaapi_x11
|
vaapi_x11
|
||||||
vdpau_x11
|
vdpau_x11
|
||||||
winrt
|
winrt
|
||||||
|
wincrypt
|
||||||
"
|
"
|
||||||
|
|
||||||
# options emitted with CONFIG_ prefix but not available on the command line
|
# options emitted with CONFIG_ prefix but not available on the command line
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#if HAVE_IO_H
|
#if HAVE_IO_H
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_CRYPTGENRANDOM
|
#if HAVE_WINCRYPT
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <wincrypt.h>
|
#include <wincrypt.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -121,7 +121,7 @@ uint32_t av_get_random_seed(void)
|
||||||
{
|
{
|
||||||
uint32_t seed;
|
uint32_t seed;
|
||||||
|
|
||||||
#if HAVE_CRYPTGENRANDOM
|
#if HAVE_WINCRYPT
|
||||||
HCRYPTPROV provider;
|
HCRYPTPROV provider;
|
||||||
if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
|
if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
|
||||||
CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
|
CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
|
||||||
|
|
Loading…
Reference in New Issue