aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 05:36:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-07 16:38:29 +0200
commit4b6b0a164c8c21a7363baaa2590c9f1e52b46a00 (patch)
tree46617fed65415f59d2f8da6e4d0332d65e8cbc14
parent25d7a33251c6c98bb0dee1c15e3aa8f1aab86b84 (diff)
downloadffmpeg-4b6b0a164c8c21a7363baaa2590c9f1e52b46a00.tar.gz
ffserver: fix return value of add_codec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ff814c75a3f52d264e6c6092736f6db2fb72a61c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index aebe651617..e7fdfbece0 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) {