mirror of https://git.ffmpeg.org/ffmpeg.git
reindent
Originally committed as revision 13860 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d2a1ea1d9b
commit
2b9cd1e78a
38
ffserver.c
38
ffserver.c
|
@ -518,15 +518,15 @@ static int http_server(void)
|
||||||
HTTPContext *c, *c_next;
|
HTTPContext *c, *c_next;
|
||||||
|
|
||||||
if (my_http_addr.sin_port) {
|
if (my_http_addr.sin_port) {
|
||||||
server_fd = socket_open_listen(&my_http_addr);
|
server_fd = socket_open_listen(&my_http_addr);
|
||||||
if (server_fd < 0)
|
if (server_fd < 0)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (my_rtsp_addr.sin_port) {
|
if (my_rtsp_addr.sin_port) {
|
||||||
rtsp_server_fd = socket_open_listen(&my_rtsp_addr);
|
rtsp_server_fd = socket_open_listen(&my_rtsp_addr);
|
||||||
if (rtsp_server_fd < 0)
|
if (rtsp_server_fd < 0)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!rtsp_server_fd && !server_fd) {
|
if (!rtsp_server_fd && !server_fd) {
|
||||||
|
@ -546,14 +546,14 @@ static int http_server(void)
|
||||||
for(;;) {
|
for(;;) {
|
||||||
poll_entry = poll_table;
|
poll_entry = poll_table;
|
||||||
if (server_fd) {
|
if (server_fd) {
|
||||||
poll_entry->fd = server_fd;
|
poll_entry->fd = server_fd;
|
||||||
poll_entry->events = POLLIN;
|
poll_entry->events = POLLIN;
|
||||||
poll_entry++;
|
poll_entry++;
|
||||||
}
|
}
|
||||||
if (rtsp_server_fd) {
|
if (rtsp_server_fd) {
|
||||||
poll_entry->fd = rtsp_server_fd;
|
poll_entry->fd = rtsp_server_fd;
|
||||||
poll_entry->events = POLLIN;
|
poll_entry->events = POLLIN;
|
||||||
poll_entry++;
|
poll_entry++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait for events on each HTTP handle */
|
/* wait for events on each HTTP handle */
|
||||||
|
@ -634,15 +634,15 @@ static int http_server(void)
|
||||||
|
|
||||||
poll_entry = poll_table;
|
poll_entry = poll_table;
|
||||||
if (server_fd) {
|
if (server_fd) {
|
||||||
/* new HTTP connection request ? */
|
/* new HTTP connection request ? */
|
||||||
if (poll_entry->revents & POLLIN)
|
if (poll_entry->revents & POLLIN)
|
||||||
new_connection(server_fd, 0);
|
new_connection(server_fd, 0);
|
||||||
poll_entry++;
|
poll_entry++;
|
||||||
}
|
}
|
||||||
if (rtsp_server_fd) {
|
if (rtsp_server_fd) {
|
||||||
/* new RTSP connection request ? */
|
/* new RTSP connection request ? */
|
||||||
if (poll_entry->revents & POLLIN)
|
if (poll_entry->revents & POLLIN)
|
||||||
new_connection(rtsp_server_fd, 1);
|
new_connection(rtsp_server_fd, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue