diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 06:53:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 06:53:38 +0100 |
| commit | 3b0b8c65313c4e47bf1662ecca64009aa3825024 (patch) | |
| tree | 20a50a27cf6a6e1a1d3fec401526ef6e6776ac13 /ffserver.c | |
| parent | cee1568ae18696919ad9cfea1d536364e4d53d9b (diff) | |
| parent | 1f625431e2bb9564760fba3ab8077ae07ce7c7a1 (diff) | |
| download | ffmpeg-3b0b8c65313c4e47bf1662ecca64009aa3825024.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
vorbis: Avoid some out-of-bounds reads
vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
vp3: fix streams with non-zero last coefficient
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c index 83dd986dc2..a3c6625ef6 100644 --- a/ffserver.c +++ b/ffserver.c @@ -516,6 +516,7 @@ static int socket_open_listen(struct sockaddr_in *my_addr) tmp = 1; setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp)); + my_addr->sin_family = AF_INET; if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) { char bindmsg[32]; snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port)); |