diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 12:25:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 12:25:50 +0200 |
| commit | 54df78af657bbbd8b5e89b7bd8756be38e98e7d7 (patch) | |
| tree | aa7d07974d67ba288807dbf5228e40303dd9d849 /libavcodec/adxdec.c | |
| parent | 09c538b6e6f3a2abb3143e88cce33c58ca64fd9d (diff) | |
| parent | b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae (diff) | |
| download | ffmpeg-54df78af657bbbd8b5e89b7bd8756be38e98e7d7.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adxdec.c')
0 files changed, 0 insertions, 0 deletions