[FFmpeg-cvslog] r18104 - trunk/ffserver.c

[bcoudurier]

Author: bcoudurier
Date: Sat Mar 21 10:58:07 2009
New Revision: 18104

Log:
do not call av_find_stream_info if stream is ffm, should fix stalling

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sat Mar 21 10:56:25 2009	(r18103)
+++ trunk/ffserver.c	Sat Mar 21 10:58:07 2009	(r18104)
@@ -2002,7 +2002,7 @@ static int open_input_stream(HTTPContext
     }
     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;