ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Oct 10
12:25:50 2014 +0200| [54df78af657bbbd8b5e89b7bd8756be38e98e7d7] | committer:
Michael Niedermayer
Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'
* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
w32pthreads: use the condition variable API directly when targeting newer
versions of Windows
Conflicts:
compat/w32pthreads.h
See: 8c6992bf0cc24542a5ae245cd037a23638b76d75
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54df78af657bbbd8b5e89b7bd8756be38e98e7d7
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
