Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index f3b2b19909108555639332f7902d398c9923dc9e..0946d0e392808793ffea6d54de8cdb3640f23441 100644 (file)
--- 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;
 }