[FFmpeg-cvslog] ffserver: fix return value of add_codec()

Michael Niedermayer git at videolan.org
Sun Apr 7 16:45:20 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 05:36:41 2012 +0200| [4b6b0a164c8c21a7363baaa2590c9f1e52b46a00] | committer: Michael Niedermayer

ffserver: fix return value of add_codec()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ff814c75a3f52d264e6c6092736f6db2fb72a61c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b6b0a164c8c21a7363baaa2590c9f1e52b46a00
---

 ffserver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffserver.c b/ffserver.c
index aebe651..e7fdfbe 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3806,7 +3806,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) {



More information about the ffmpeg-cvslog mailing list