Commit dca3542d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Add -Wno-format-zero-length to CFLAGS.
  udp: Receive on the remote port number, if no local port is set
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e65d6e22 b36518dc
......@@ -3035,6 +3035,7 @@ check_cflags -Wdeclaration-after-statement
check_cflags -Wall
check_cflags -Wno-parentheses
check_cflags -Wno-switch
check_cflags -Wno-format-zero-length
check_cflags -Wdisabled-optimization
check_cflags -Wpointer-arith
check_cflags -Wredundant-decls
......
......@@ -444,7 +444,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
goto fail;
}
if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
if ((s->is_multicast || !s->local_port) && (h->flags & AVIO_FLAG_READ))
s->local_port = port;
udp_fd = udp_socket_create(s, &my_addr, &len);
if (udp_fd < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment