Browse Source

check that stream is set, fixes CID13 RUN2

Originally committed as revision 13522 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Baptiste Coudurier 17 years ago
parent
commit
ce651af2b2
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      ffserver.c

+ 2
- 1
ffserver.c View File

@@ -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;


Loading…
Cancel
Save