From 2d563d2f8ebbfbbf872b196430b1d98249b9bed8 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 8 Aug 2007 19:23:40 +0000 Subject: cosmetic: simplify some constructs Originally committed as revision 9989 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'ffserver.c') diff --git a/ffserver.c b/ffserver.c index 47c4bcc..53939b7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1507,11 +1507,8 @@ static int http_parse_request(HTTPContext *c) break; } - if (wmpc) { - if (modify_current_stream(wmpc, ratebuf)) { - wmpc->switch_pending = 1; - } - } + if (wmpc && modify_current_stream(wmpc, ratebuf)) + wmpc->switch_pending = 1; } snprintf(msg, sizeof(msg), "POST command not handled"); @@ -1840,13 +1837,10 @@ static void compute_stats(HTTPContext *c) bitrate = 0; if (c1->stream) { 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; - } else { - if (c1->feed_streams[j] >= 0) { - bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; - } - } + else if (c1->feed_streams[j] >= 0) + bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; } } -- cgit v1.1