]> git.sesse.net Git - ffmpeg/commitdiff
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>
1  2 
configure
libavutil/random_seed.c

diff --cc configure
index ca5fe7153fe896d62538fc37cacfbb0efe295cc5,75f9fa91ebeb3f1c4c0796afa13fdd3b1282b383..5461f42c9db64d6265786db2ae0e8d4fc9c82091
+++ 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
index d1c9a3f7046d7efada2e11194819e113ab0f6bb7,089d883916e89b1a68df973a264e380af0b870dd..881c23c8c81c2b91ff69521247a4219eb1feebb5
  #if HAVE_UNISTD_H
  #include <unistd.h>
  #endif
- #if HAVE_CRYPTGENRANDOM
 +#if HAVE_IO_H
 +#include <io.h>
 +#endif
+ #if HAVE_WINCRYPT
  #include <windows.h>
  #include <wincrypt.h>
  #endif