Originally committed as revision 13523 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-29 02:29:33 +00:00
parent ce651af2b2
commit 7e183a93d8

View File

@ -4234,19 +4234,19 @@ static int parse_ffconfig(const char *filename)
filename, line_num); filename, line_num);
errors++; errors++;
} else { } else {
if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) {
if (audio_id != CODEC_ID_NONE) { if (audio_id != CODEC_ID_NONE) {
audio_enc.codec_type = CODEC_TYPE_AUDIO; audio_enc.codec_type = CODEC_TYPE_AUDIO;
audio_enc.codec_id = audio_id; audio_enc.codec_id = audio_id;
add_codec(stream, &audio_enc); add_codec(stream, &audio_enc);
}
if (video_id != CODEC_ID_NONE) {
video_enc.codec_type = CODEC_TYPE_VIDEO;
video_enc.codec_id = video_id;
add_codec(stream, &video_enc);
}
} }
if (video_id != CODEC_ID_NONE) { stream = NULL;
video_enc.codec_type = CODEC_TYPE_VIDEO;
video_enc.codec_id = video_id;
add_codec(stream, &video_enc);
}
}
stream = NULL;
} }
} else if (!strcasecmp(cmd, "<Redirect")) { } else if (!strcasecmp(cmd, "<Redirect")) {
/*********************************************/ /*********************************************/