RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
James Almer 2017-11-11 16:53:19 -03:00
parent 8882e8ad0d 7ac092d05d
commit 3f27200954
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

4
libavutil/random_seed.c
View 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)) {