Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Jun 2012 17:52:35 +0000 (19:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Jun 2012 17:59:39 +0000 (19:59 +0200)
commitfbc5e0fae12a72b547e6d841e80116ce5c26fbf0
treed3cec49752d4d014852a2d7afefa02cf1b1f35e5
parent0d83edaba9f4b298fa8a645a032bc84e0c03ef1b
parentdbaf79c9d7270eafd2479d9c650efa1433d65efd
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>
libavformat/avisynth.c
libavformat/http.c
libavformat/tcp.c