Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index cb7e3aeda318f9b1f3dbff087502b6202db0c10f..4dd0ae24c89c4a92f6985dfdfef422d533ef998f 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -3474,6 +3474,9 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
 {
     AVStream *fst;
 
+    if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
+        return NULL;
+
     fst = av_mallocz(sizeof(AVStream));
     if (!fst)
         return NULL;
@@ -3821,6 +3824,9 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
 {
     AVStream *st;
 
+    if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
+        return;
+
     /* compute default parameters */
     switch(av->codec_type) {
     case AVMEDIA_TYPE_AUDIO: