ffserver: Replace two loops with one loop.
Signed-off-by: Mike Williams <mike@mikebwilliams.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
parent
daca33659d
commit
863e2046fd
16
ffserver.c
16
ffserver.c
@ -3644,18 +3644,6 @@ static void build_feed_streams(void)
|
|||||||
FFStream *stream, *feed;
|
FFStream *stream, *feed;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* gather all streams */
|
|
||||||
for(stream = first_stream; stream != NULL; stream = stream->next) {
|
|
||||||
feed = stream->feed;
|
|
||||||
if (feed) {
|
|
||||||
if (!stream->is_feed) {
|
|
||||||
/* we handle a stream coming from a feed */
|
|
||||||
for(i=0;i<stream->nb_streams;i++)
|
|
||||||
stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* gather all streams */
|
/* gather all streams */
|
||||||
for(stream = first_stream; stream != NULL; stream = stream->next) {
|
for(stream = first_stream; stream != NULL; stream = stream->next) {
|
||||||
feed = stream->feed;
|
feed = stream->feed;
|
||||||
@ -3663,6 +3651,10 @@ static void build_feed_streams(void)
|
|||||||
if (stream->is_feed) {
|
if (stream->is_feed) {
|
||||||
for(i=0;i<stream->nb_streams;i++)
|
for(i=0;i<stream->nb_streams;i++)
|
||||||
stream->feed_streams[i] = i;
|
stream->feed_streams[i] = i;
|
||||||
|
} else {
|
||||||
|
/* we handle a stream coming from a feed */
|
||||||
|
for(i=0;i<stream->nb_streams;i++)
|
||||||
|
stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user