diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 12:30:35 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 12:30:35 +0400 |
| commit | 4d4f5911d3121133929da7b859755860f93684fd (patch) | |
| tree | 25ca85b33909e89c0eb65b289158d14c79264af5 /libavformat/network.h | |
| parent | 5711e4fd111a20afce15c90cb9b8d486f869a4e5 (diff) | |
| parent | 28306e6d620c109ddd672f7243adfbc2bbb3b18f (diff) | |
Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'
* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
network: factor out bind-listening code
use my full first name instead of short one in copyrights
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index f8b4dee50e..9335bbc0ad 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -222,4 +222,7 @@ const char *ff_gai_strerror(int ecode); int ff_is_multicast_address(struct sockaddr *addr); +int ff_listen_bind(int fd, const struct sockaddr *addr, + socklen_t addrlen, int timeout); + #endif /* AVFORMAT_NETWORK_H */ |