Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index 955c326b8cb4dc681e00096a0ac128831249c912..4dd0ae24c89c4a92f6985dfdfef422d533ef998f 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -3825,7 +3825,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
     AVStream *st;
 
     if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
-        return NULL;
+        return;
 
     /* compute default parameters */
     switch(av->codec_type) {