diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 12:08:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 12:13:09 +0200 |
| commit | 09c538b6e6f3a2abb3143e88cce33c58ca64fd9d (patch) | |
| tree | aa7d07974d67ba288807dbf5228e40303dd9d849 /libavcodec/bmp.h | |
| parent | 19b4c0ccf924366e9a61793e7334d7bd82c68f23 (diff) | |
| parent | 73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11 (diff) | |
| download | ffmpeg-09c538b6e6f3a2abb3143e88cce33c58ca64fd9d.tar.gz | |
Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'
* commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11':
w32pthreads: use the CONDITION_VARIABLE typedef if available
Conflicts:
compat/w32pthreads.h
configure
See: 0c0694931442ef9ea91eace120e0629e0ac01b76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp.h')
0 files changed, 0 insertions, 0 deletions