diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 10:52:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 11:02:02 +0200 |
| commit | 54ddbb477b786be1b90f54bc9aab36cd5babdf7d (patch) | |
| tree | 6396225eedd6179882e50cd4aa82d877eeb53da0 /libavformat/network.h | |
| parent | 4d4f5911d3121133929da7b859755860f93684fd (diff) | |
| parent | f849a77e67959eb6a83eb59b784aeefdb98cb80a (diff) | |
| download | ffmpeg-54ddbb477b786be1b90f54bc9aab36cd5babdf7d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
network: factor out connect-listening code
Conflicts:
libavformat/network.h
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 9335bbc0ad..c6264fdc5f 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -28,6 +28,7 @@ #include "libavutil/error.h" #include "os_support.h" #include "avio.h" +#include "url.h" #if HAVE_UNISTD_H #include <unistd.h> @@ -224,5 +225,7 @@ int ff_is_multicast_address(struct sockaddr *addr); int ff_listen_bind(int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout); - +int ff_listen_connect(int fd, const struct sockaddr *addr, + socklen_t addrlen, int timeout, + URLContext *h); #endif /* AVFORMAT_NETWORK_H */ |