Michael Niedermayer fbc5e0fae1 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>

2012-06-01 19:59:39 +02:00

6.1 KiB

Raw Blame History

View Raw