]> git.sesse.net Git - ffmpeg/commit
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)
commit217ad40aef9eeeff4e805dec3e980fb16aec3345
treecaf94b81d8960787b08a629421c05d9110315d0f
parent52b44e9d15c0ee3c118ed68a0c2c737a9eb50ae9
parentc7ab6aff66cba2f265f656ce8d56aa428d4ada76
Merge commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76'

* commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76':
  w32pthreads: always use Vista+ API, drop XP support

This commit is a noop, see 9b121dfc32810250938021952aab4172a988cb56

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