[FFmpeg-cvslog] r25603 - trunk/ffmpeg.c

[cehoyos]

Author: cehoyos
Date: Fri Oct 29 16:54:18 2010
New Revision: 25603

Log:
Fix ffserver-related regression (and crash) introduced in r25500.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Oct 29 16:48:38 2010	(r25602)
+++ trunk/ffmpeg.c	Fri Oct 29 16:54:18 2010	(r25603)
@@ -664,11 +664,13 @@ static int read_ffserver_streams(AVForma
     if (err < 0)
         return err;
     /* copy stream format */
-    s->nb_streams = ic->nb_streams;
+    s->nb_streams = 0;
     for(i=0;i<ic->nb_streams;i++) {
         AVStream *st;
         AVCodec *codec;
 
+        s->nb_streams++;
+
         // FIXME: a more elegant solution is needed
         st = av_mallocz(sizeof(AVStream));
         memcpy(st, ic->streams[i], sizeof(AVStream));
@@ -700,6 +702,8 @@ static int read_ffserver_streams(AVForma
 
         if(st->codec->flags & CODEC_FLAG_BITEXACT)
             nopts = 1;
+
+        new_output_stream(s, nb_output_files);
     }
 
     if (!nopts)