summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-29 02:11:46 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-29 02:11:46 +0000
commit5735f6dca0e238e65e0014caa3acbfad9d90e67c (patch)
treebba5a14d60b95ca47027135b1ed7ca56315c2c90 /ffserver.c
parent75480e86baaa56449cae997db1b8a23e582a40e5 (diff)
check if stream has been set, fixes CID15 RUN2
Originally committed as revision 13521 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c
index 58431868b9..372e6abd84 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3910,6 +3910,7 @@ static int parse_ffconfig(const char *filename)
}
} else if (!strcasecmp(cmd, "Format")) {
get_arg(arg, sizeof(arg), &p);
+ if (stream) {
if (!strcmp(arg, "status")) {
stream->stream_type = STREAM_TYPE_STATUS;
stream->fmt = NULL;
@@ -3929,6 +3930,7 @@ static int parse_ffconfig(const char *filename)
audio_id = stream->fmt->audio_codec;
video_id = stream->fmt->video_codec;
}
+ }
} else if (!strcasecmp(cmd, "InputFormat")) {
get_arg(arg, sizeof(arg), &p);
stream->ifmt = av_find_input_format(arg);