diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 00:12:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 00:12:49 +0100 |
| commit | f371a4a57d481e1957038fdf81b6f9d3171e7824 (patch) | |
| tree | e7ec287f42d991214e2f4f0c1d13d9c00e3a71a8 /libavcodec/imgconvert.c | |
| parent | 26ce266e3df8d50b0e6b3b402f2436903424c30c (diff) | |
| parent | bd0fba87972b1be826361a5acda363586708d38d (diff) | |
| download | ffmpeg-f371a4a57d481e1957038fdf81b6f9d3171e7824.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Explicitly disable w32threads if the test for it fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
0 files changed, 0 insertions, 0 deletions