• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · fbc5e0fa
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    fbc5e0fa
avisynth.c 7.54 KB