do not call av_find_stream_info if stream is ffm, should fix stalling
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 21 Mar 2009 09:58:07 +0000 (09:58 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 21 Mar 2009 09:58:07 +0000 (09:58 +0000)
Originally committed as revision 18104 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffserver.c

index 39ab563..279ffaa 100644 (file)
@@ -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;