diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 19:40:51 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 19:51:09 +0400 |
commit | 042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18 (patch) | |
tree | fe6d6db2945987a5c10923fb28515361eea6eab2 /ffserver.c | |
parent | e6cc30c22bb2007e4d66302d6477176ecf0c0877 (diff) | |
parent | e3bc07f4af25287fa4ade1e9c5501de65c8a698e (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
-rw-r--r-- | ffserver.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ffserver.c b/ffserver.c index a99e375e67..1795a2a29c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3648,21 +3648,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]); } } } |