diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-02 00:07:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-02 00:07:51 +0100 |
| commit | 3638f56dca167a408b6da7fb78cade08780f7d85 (patch) | |
| tree | 33845c2f14c535096353e07fc84570e6fa9b1b87 /libavcodec/mjpegdec.c | |
| parent | 3fd0f6ed252e51ffaec7765a2637794366a513ba (diff) | |
| parent | 7b7b220cf709f193e5e79b5fc83b51196aab7cf6 (diff) | |
| download | ffmpeg-3638f56dca167a408b6da7fb78cade08780f7d85.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Enable w32threads automatically unless explicitly disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions