virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

cosmetic: simplify some constructs

Browse Source 
Originally committed as revision 9989 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi
2007-08-08 19:23:40 +00:00
parent 6ff3f3e7ce
commit 2d563d2f8e
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ffserver.c
View File

@@ -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)
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;
}
}
} }
} }