]> git.sesse.net Git - ffmpeg/commit
Merge commit 'abf806f7f1601c7e54de7f863bbb816af144a88c'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:41:34 +0000 (16:41 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:41:34 +0000 (16:41 -0300)
commit22219a3ac46ac18f797c94e4619a34728556786c
treeb408870212e8687c2cff34e8cf25f53244f1c6c6
parentfef55251d82ca1043689dddf5d03aa96c75cd4bb
parentabf806f7f1601c7e54de7f863bbb816af144a88c
Merge commit 'abf806f7f1601c7e54de7f863bbb816af144a88c'

* commit 'abf806f7f1601c7e54de7f863bbb816af144a88c':
  random_seed: use bcrypt instead of the old wincrypt API

This commit is a noop, see aedbf1640ced8fc09dc980ead2a387a59d8f7f68

Merged-by: James Almer <jamrial@gmail.com>