projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6bb00b
)
check if stream is set, fix potential segv
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Sat, 25 Oct 2008 00:49:56 +0000
(
00:49
+0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Sat, 25 Oct 2008 00:49:56 +0000
(
00:49
+0000)
Originally committed as revision 15693 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
379619f
..
62d708c
100644
(file)
--- a/
ffserver.c
+++ b/
ffserver.c
@@
-4018,11
+4018,13
@@
static int parse_ffconfig(const char *filename)
}
} else if (!strcasecmp(cmd, "InputFormat")) {
get_arg(arg, sizeof(arg), &p);
+ if (stream) {
stream->ifmt = av_find_input_format(arg);
if (!stream->ifmt) {
fprintf(stderr, "%s:%d: Unknown input format: %s\n",
filename, line_num, arg);
}
+ }
} else if (!strcasecmp(cmd, "FaviconURL")) {
if (stream && stream->stream_type == STREAM_TYPE_STATUS) {
get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);