diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:08:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:08:15 +0100 |
| commit | c0cbf3af0188d06a11c74b3ab2402de1c248a76b (patch) | |
| tree | 4be83b2a1891d611c6543adaa400f6f438dfbe51 /ffserver.c | |
| parent | 870e74dc435e76cecdbe936329a04845d680ed29 (diff) | |
| parent | 3b0b8c65313c4e47bf1662ecca64009aa3825024 (diff) | |
| download | ffmpeg-c0cbf3af0188d06a11c74b3ab2402de1c248a76b.tar.gz | |
Merge branch 'release/0.8' into release/0.7
* release/0.8:
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
Update for 0.8.9
vp3: fix regression with mplayer-crash.ogv
h264: fix init of topleft ref/mv. Fixes Ticket778
Update for 0.8.8
Conflicts:
Doxyfile
RELEASE
VERSION
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 2aa778f823..8f5c2baf72 100644 --- a/ffserver.c +++ b/ffserver.c @@ -518,6 +518,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)); |