OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5735f6d
)
check that stream is set, fixes CID13 RUN2
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 29 May 2008 02:28:33 +0000
(
02:28
+0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 29 May 2008 02:28:33 +0000
(
02:28
+0000)
Originally committed as revision 13522 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
372e6ab
..
16d4808
100644
(file)
--- a/
ffserver.c
+++ b/
ffserver.c
@@
-4233,7
+4233,7
@@
static int parse_ffconfig(const char *filename)
fprintf(stderr, "%s:%d: No corresponding <Stream> for </Stream>\n",
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;
@@
-4247,6
+4247,7
@@
static int parse_ffconfig(const char *filename)
}
}
stream = NULL;
+ }
} else if (!strcasecmp(cmd, "<Redirect")) {
/*********************************************/
char *q;