You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'
* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
w32pthreads: use the condition variable API directly when targeting newer versions of Windows
Conflicts:
compat/w32pthreads.h
See: 8c6992bf0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: