diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-21 09:58:07 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-21 09:58:07 +0000 |
| commit | 85fe4ae0d0fbae4e57fc5a060c1e99fa11f42d67 (patch) | |
| tree | 87603ac96ecafeef506d42f6cab24489f46ee3d1 | |
| parent | 0bdd8b858f981ee42650459bd12f0f8c0e756d12 (diff) | |
| download | ffmpeg-85fe4ae0d0fbae4e57fc5a060c1e99fa11f42d67.tar.gz | |
do not call av_find_stream_info if stream is ffm, should fix stalling
Originally committed as revision 18104 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 39ab5632ef..279ffaa43f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2002,7 +2002,7 @@ static int open_input_stream(HTTPContext *c, const char *info) } s->flags |= AVFMT_FLAG_GENPTS; c->fmt_in = s; - if (av_find_stream_info(c->fmt_in) < 0) { + if (strcmp(s->iformat->name, "ffm") && av_find_stream_info(c->fmt_in) < 0) { http_log("Could not find stream info '%s'\n", input_filename); av_close_input_file(s); return -1; |