summaryrefslogtreecommitdiff
path: root/libavformat/unix.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/unix: reshuffle #includesMichael Niedermayer2013-08-211-3/+1
| | | | | | This should fix openbsd while hopefully also working on solaris & android Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/unix: include sys/socket.hMichael Niedermayer2013-08-211-0/+1
| | | | | | unbreak android ndk r8 build Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'Michael Niedermayer2013-08-061-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a': tcp: Use a different log message and level if there's more addresses to try Conflicts: libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tcp: Use a different log message and level if there's more addresses to tryMartin Storsjö2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | This lowers the level of warnings printed if trying to connect to a host name that provides both v6 and v4 addresses but the service only is available on the v4 address (often occurring for 'localhost', with servers that aren't v6-aware). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798'Michael Niedermayer2013-08-061-1/+1
|\ \ | |/ | | | | | | | | | | * commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798': unix: Convert from AVERROR to errno range before comparing error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * unix: Convert from AVERROR to errno range before comparing error codesMartin Storsjö2013-08-061-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'Michael Niedermayer2013-08-061-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'bb9378251a167ef0116f263912e57f715c1e02ac': network: Use SOCK_CLOEXEC when available Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * network: Use SOCK_CLOEXEC when availableLuca Barbato2013-08-051-1/+1
| |
* | Merge commit '605387582bd35920b83a26dabbe1c0601f425621'Michael Niedermayer2013-08-061-4/+4
|/ | | | | | | | | | * commit '605387582bd35920b83a26dabbe1c0601f425621': lavf: Support unix sockets Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: Support unix socketsLuca Barbato2013-08-051-0/+156
View Lorry Controller Status