[FFmpeg-cvslog] ffserver: reflow find_stream_in_feed()
Reynaldo H. Verdejo Pinochet
git at videolan.org
Sat Jan 24 06:31:10 CET 2015
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sat Jan 24 01:56:18 2015 -0300| [2699a378167550d50f2b32587bdbc985a2a6bc54] | committer: Reynaldo H. Verdejo Pinochet
ffserver: reflow find_stream_in_feed()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2699a378167550d50f2b32587bdbc985a2a6bc54
---
ffserver.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index f3b2b19..0946d0e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1117,14 +1117,13 @@ static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec, int
best_bitrate = feed_codec->bit_rate;
best = i;
}
- } else {
- if (feed_codec->bit_rate < best_bitrate) {
- best_bitrate = feed_codec->bit_rate;
- best = i;
- }
+ continue;
+ }
+ if (feed_codec->bit_rate < best_bitrate) {
+ best_bitrate = feed_codec->bit_rate;
+ best = i;
}
}
-
return best;
}
More information about the ffmpeg-cvslog
mailing list