diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 02:22:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 02:24:10 +0200 |
| commit | 80e4fe4063001d0cf468d5f4c7c02ba5b04484b7 (patch) | |
| tree | ab237b4967339905110c59f6a118bfda9a5a5433 /ffserver.c | |
| parent | 6b61920ab76dc6d85ef462909951923935dd643f (diff) | |
| parent | b5849f77095439e994b11c25e6063d443b36c228 (diff) | |
Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'
* commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits)
ac3enc: merge AC3MDCTContext with AC3EncodeContext.
ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
ac3enc: fix memleak
mpeg1video: add CODEC_CAP_SLICE_THREADS.
lavf: fix segfault in av_open_input_stream()
mpegtsenc: set Random Access indicator on keyframe start packets
lavf: Cleanup try_decode_frame() logic.
Replace some gotos that lead to single return statements by direct return.
build: move tests/seek_test.c to libavformat and reuse generic build rules
mxfenc: include needed header for ff_iso8601_to_unix_time() prototype
Add a check for strptime().
lavf: factor out conversion of ISO8601 string to unix time
wav: parse 'bext' metadata
wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
wav: Refactor the tag checking into a switch statement
wav: make sure neither data_size nor sample_count is negative.
wav: refactor the 'fmt ' tag search and parsing.
wav: add an option for writing BEXT chunk
ffmpeg: get rid of a pointless limit on number of streams.
ffmpeg: remove an unused define.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 10da70bd91..a99e375e67 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3508,7 +3508,7 @@ static int add_av_stream(FFStream *feed, AVStream *st) case AVMEDIA_TYPE_AUDIO: if (av1->channels == av->channels && av1->sample_rate == av->sample_rate) - goto found; + return i; break; case AVMEDIA_TYPE_VIDEO: if (av1->width == av->width && @@ -3516,7 +3516,7 @@ static int add_av_stream(FFStream *feed, AVStream *st) av1->time_base.den == av->time_base.den && av1->time_base.num == av->time_base.num && av1->gop_size == av->gop_size) - goto found; + return i; break; default: abort(); @@ -3528,8 +3528,6 @@ static int add_av_stream(FFStream *feed, AVStream *st) if (!fst) return -1; return feed->nb_streams - 1; - found: - return i; } static void remove_stream(FFStream *stream) |