diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-29 02:28:33 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-29 02:28:33 +0000 |
| commit | ce651af2b2f5fc45ef93d7537b63a345dd0ac04c (patch) | |
| tree | c4cb92727a64fd6d50a2dc3a72eeea6496b2386e /ffserver.c | |
| parent | 5735f6dca0e238e65e0014caa3acbfad9d90e67c (diff) | |
| download | ffmpeg-ce651af2b2f5fc45ef93d7537b63a345dd0ac04c.tar.gz | |
check that stream is set, fixes CID13 RUN2
Originally committed as revision 13522 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 372e6abd84..16d48085e2 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4233,7 +4233,7 @@ static int parse_ffconfig(const char *filename) fprintf(stderr, "%s:%d: No corresponding <Stream> for </Stream>\n", filename, line_num); errors++; - } + } else { if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { if (audio_id != CODEC_ID_NONE) { audio_enc.codec_type = CODEC_TYPE_AUDIO; @@ -4247,6 +4247,7 @@ static int parse_ffconfig(const char *filename) } } stream = NULL; + } } else if (!strcasecmp(cmd, "<Redirect")) { /*********************************************/ char *q; |