ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Nov 11 16:53:19 2017 -0300| [3f272009547fe1b941764297007ea1aa576eda6f] | committer: James Almer
Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c' * commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c': build: CryptGenRandom --> wincrypt, it is a better name Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f272009547fe1b941764297007ea1aa576eda6f --- configure | 2 +- libavutil/random_seed.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ca5fe7153f..5461f42c9d 100755 --- 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 diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index d1c9a3f704..881c23c8c8 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -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)) { ====================================================================== diff --cc configure index ca5fe7153f,75f9fa91eb..5461f42c9d --- a/configure +++ b/configure @@@ -2112,7 -1705,7 +2111,8 @@@ HAVE_LIST= vaapi_drm vaapi_x11 vdpau_x11 + winrt + wincrypt " # options emitted with CONFIG_ prefix but not available on the command line diff --cc libavutil/random_seed.c index d1c9a3f704,089d883916..881c23c8c8 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@@ -23,10 -23,7 +23,10 @@@ #if HAVE_UNISTD_H #include <unistd.h> #endif +#if HAVE_IO_H +#include <io.h> +#endif - #if HAVE_CRYPTGENRANDOM + #if HAVE_WINCRYPT #include <windows.h> #include <wincrypt.h> #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
