diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-01 19:52:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-01 19:59:39 +0200 |
| commit | fbc5e0fae12a72b547e6d841e80116ce5c26fbf0 (patch) | |
| tree | d3cec49752d4d014852a2d7afefa02cf1b1f35e5 /common.mak | |
| parent | 0d83edaba9f4b298fa8a645a032bc84e0c03ef1b (diff) | |
| parent | dbaf79c9d7270eafd2479d9c650efa1433d65efd (diff) | |
| download | ffmpeg-fbc5e0fae12a72b547e6d841e80116ce5c26fbf0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Add the url_shutdown function for https, too
http: Simplify code by removing a local variable
http: Clear the old URLContext pointer when closed
tcp: Try enabling SO_REUSEADDR when listening
tcp: Check the return values from bind and accept
avisynth: Make sure the filename passed to avisynth is in the right code page
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions