diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-22 00:53:28 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-22 00:53:28 +0000 |
| commit | 2b9cd1e78acba5e5642b220ea9dc16384c7132c0 (patch) | |
| tree | 0df605f2f360f7654287279c6668b1f3d43cb34f /ffserver.c | |
| parent | d2a1ea1d9b43c7424cfa88a498c17599238b1042 (diff) | |
| download | ffmpeg-2b9cd1e78acba5e5642b220ea9dc16384c7132c0.tar.gz | |
reindent
Originally committed as revision 13860 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ffserver.c b/ffserver.c index fa82b6147e..f40f229c78 100644 --- a/ffserver.c +++ b/ffserver.c @@ -518,15 +518,15 @@ static int http_server(void) HTTPContext *c, *c_next; if (my_http_addr.sin_port) { - server_fd = socket_open_listen(&my_http_addr); - if (server_fd < 0) - return -1; + server_fd = socket_open_listen(&my_http_addr); + if (server_fd < 0) + return -1; } if (my_rtsp_addr.sin_port) { - rtsp_server_fd = socket_open_listen(&my_rtsp_addr); - if (rtsp_server_fd < 0) - return -1; + rtsp_server_fd = socket_open_listen(&my_rtsp_addr); + if (rtsp_server_fd < 0) + return -1; } if (!rtsp_server_fd && !server_fd) { @@ -546,14 +546,14 @@ static int http_server(void) for(;;) { poll_entry = poll_table; if (server_fd) { - poll_entry->fd = server_fd; - poll_entry->events = POLLIN; - poll_entry++; + poll_entry->fd = server_fd; + poll_entry->events = POLLIN; + poll_entry++; } if (rtsp_server_fd) { - poll_entry->fd = rtsp_server_fd; - poll_entry->events = POLLIN; - poll_entry++; + poll_entry->fd = rtsp_server_fd; + poll_entry->events = POLLIN; + poll_entry++; } /* wait for events on each HTTP handle */ @@ -634,15 +634,15 @@ static int http_server(void) poll_entry = poll_table; if (server_fd) { - /* new HTTP connection request ? */ - if (poll_entry->revents & POLLIN) - new_connection(server_fd, 0); - poll_entry++; + /* new HTTP connection request ? */ + if (poll_entry->revents & POLLIN) + new_connection(server_fd, 0); + poll_entry++; } if (rtsp_server_fd) { - /* new RTSP connection request ? */ - if (poll_entry->revents & POLLIN) - new_connection(rtsp_server_fd, 1); + /* new RTSP connection request ? */ + if (poll_entry->revents & POLLIN) + new_connection(rtsp_server_fd, 1); } } } |