]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
do not call av_find_stream_info if stream is ffm, should fix stalling
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 21 Mar 2009 09:58:07 +0000 (09:58 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 21 Mar 2009 09:58:07 +0000 (09:58 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18104 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ffserver.c

index 39ab5632efa201fb64e5043f00a0c030571c398a..279ffaa43fc7cd900f03a5b69313b6dd33e114af 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;