diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 13:19:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 13:19:11 +0100 |
| commit | 8943ad40146d322f5a5bf2bab790d117ec7a4c37 (patch) | |
| tree | 3aa57b91ebe60e9958219e944db3d675e6972ba7 /libavformat/udp.c | |
| parent | f9f79cb0ecb68546e6de3db6072f631bb3fbcff8 (diff) | |
| parent | 4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26 (diff) | |
| download | ffmpeg-8943ad40146d322f5a5bf2bab790d117ec7a4c37.tar.gz | |
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
avio: fix pointer type mismatches in avio_enum_protocols()
avserver: use socklen_t where appropriate
udp: use socklen_t where appropriate
network: use HAVE_THREADS instead of local hack
af_channelmap: remove stray enum declaration
buffersink: remove stray semicolon after function definition
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/udp.c')
| -rw-r--r-- | libavformat/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c index c6f0a1fd71..a88fbe48a5 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -312,7 +312,7 @@ static int udp_set_url(struct sockaddr_storage *addr, } static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, - int *addr_len, const char *localaddr) + socklen_t *addr_len, const char *localaddr) { int udp_fd = -1; struct addrinfo *res0 = NULL, *res = NULL; @@ -500,7 +500,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) const char *p; char buf[256]; struct sockaddr_storage my_addr; - int len; + socklen_t len; int reuse_specified = 0; int i, include = 0, num_sources = 0; char *sources[32]; |