Skip to content

F
ffmpeg.wasm-core
Commit 2d563d2f authored by Alex Beregszaszi's avatar Alex Beregszaszi
Browse files
Options

cosmetic: simplify some constructs 

Originally committed as revision 9989 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6ff3f3e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
ffserver.c
View file @ 2d563d2f
...@@ -1507,11 +1507,8 @@ static int http_parse_request(HTTPContext *c) ...@@ -1507,11 +1507,8 @@ static int http_parse_request(HTTPContext *c)
break; break;
} }
if (wmpc) { if (wmpc && modify_current_stream(wmpc, ratebuf))
if (modify_current_stream(wmpc, ratebuf)) { wmpc->switch_pending = 1;
wmpc->switch_pending = 1;
}
}
} }
snprintf(msg, sizeof(msg), "POST command not handled"); snprintf(msg, sizeof(msg), "POST command not handled");
...@@ -1840,13 +1837,10 @@ static void compute_stats(HTTPContext *c) ...@@ -1840,13 +1837,10 @@ static void compute_stats(HTTPContext *c)
bitrate = 0; bitrate = 0;
if (c1->stream) { if (c1->stream) {
for (j = 0; j < c1->stream->nb_streams; j++) { for (j = 0; j < c1->stream->nb_streams; j++) {
if (!c1->stream->feed) { if (!c1->stream->feed)
bitrate += c1->stream->streams[j]->codec->bit_rate; bitrate += c1->stream->streams[j]->codec->bit_rate;
} else { else if (c1->feed_streams[j] >= 0)
if (c1->feed_streams[j] >= 0) { bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate;
bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate;
}
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment