Changeset fbc5e0fa in ffmpeg

Timestamp:

Jun 1, 2012, 5:59:39 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7980a260

Parents:

0d83edab (diff), dbaf79c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/01/12 17:52:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/12 17:59:39)

Message:

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>

(No files)