RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-06-25 04:04:53 +02:00
parent e65d6e22e3 b36518dcf4
commit dca3542d35
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -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

2
libavformat/udp.c
View File

@ -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)