[FFmpeg-cvslog] r13521 - trunk/ffserver.c
bcoudurier
subversion
Thu May 29 04:11:48 CEST 2008
Author: bcoudurier
Date: Thu May 29 04:11:46 2008
New Revision: 13521
Log:
check if stream has been set, fixes CID15 RUN2
Modified:
trunk/ffserver.c
Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c (original)
+++ trunk/ffserver.c Thu May 29 04:11:46 2008
@@ -3910,6 +3910,7 @@ static int parse_ffconfig(const char *fi
}
} 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 *fi
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);
More information about the ffmpeg-cvslog
mailing list