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

diff --git a/ffserver.c b/ffserver.c
index 39ab5632efa201fb64e5043f00a0c030571c398a..279ffaa43fc7cd900f03a5b69313b6dd33e114af 100644 (file)
--- 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;