diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 22:24:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 22:25:34 +0100 |
| commit | 523a803b7352564fcd28ec6d5dc0bfb6f8c5534f (patch) | |
| tree | 231a37281698cbcff5226d60c76e9a03fbdf1359 /libavresample/x86/audio_mix.asm | |
| parent | 00f25e0a990f9200806fc23d9054a47169db69a2 (diff) | |
| parent | 9409c9bdbfd829353473ee6cc3e91c726481c069 (diff) | |
| download | ffmpeg-523a803b7352564fcd28ec6d5dc0bfb6f8c5534f.tar.gz | |
Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
* commit '9409c9bdbfd829353473ee6cc3e91c726481c069':
configure: Disable networking if winsock2.h is available but winsock functions aren't
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/audio_mix.asm')
0 files changed, 0 insertions, 0 deletions