diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-29 02:29:33 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-05-29 02:29:33 +0000 |
| commit | 7e183a93d8b5b07843abd7dddc8b7215f06321ec (patch) | |
| tree | 9e9ccf32cf723dac358adfb01fcca2b004b94578 /ffserver.c | |
| parent | ce651af2b2f5fc45ef93d7537b63a345dd0ac04c (diff) | |
| download | ffmpeg-7e183a93d8b5b07843abd7dddc8b7215f06321ec.tar.gz | |
reindent
Originally committed as revision 13523 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ffserver.c b/ffserver.c index 16d48085e2..495207520f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4234,19 +4234,19 @@ static int parse_ffconfig(const char *filename) 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; - audio_enc.codec_id = audio_id; - 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 (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { + if (audio_id != CODEC_ID_NONE) { + audio_enc.codec_type = CODEC_TYPE_AUDIO; + audio_enc.codec_id = audio_id; + 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); + } } - } - stream = NULL; + stream = NULL; } } else if (!strcasecmp(cmd, "<Redirect")) { /*********************************************/ |