]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:53:31 +0000 (20:53 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:53:31 +0000 (20:53 -0300)
* commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76':
  w32pthreads: always use Vista+ API, drop XP support

This commit is a noop, see 9b121dfc32810250938021952aab4172a988cb56

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

Trivial merge