Hi, On Wed, Jul 13, 2011 at 11:24 AM, Mike Williams <[email protected]> wrote: > > Signed-off-by: Mike Williams <[email protected]> > --- > ffserver.c | 16 ++++------------ > 1 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/ffserver.c b/ffserver.c > index 1dc8a17..8bc810d 100644 > --- a/ffserver.c > +++ b/ffserver.c > @@ -3650,21 +3650,13 @@ static void build_feed_streams(void) > 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 */ > - for(stream = first_stream; stream != NULL; stream = stream->next) { > - feed = stream->feed; > - if (feed) { > if (stream->is_feed) { > for(i=0;i<stream->nb_streams;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]); > } > } > }
Thanks, pushed. (Sorry, looked at this yesterday but forgot to actually push it then.) Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
