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

mstorsjo subversion
Mon May 24 22:08:02 CEST 2010


Author: mstorsjo
Date: Mon May 24 22:08:02 2010
New Revision: 23294

Log:
ffserver: Fix streaming with more than one stream

Fix by Howard Chu, hyc at highlandsun dot com

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Mon May 24 21:59:18 2010	(r23293)
+++ trunk/ffserver.c	Mon May 24 22:08:02 2010	(r23294)
@@ -2346,7 +2346,7 @@ static int http_prepare_data(HTTPContext
                         }
                     }
                     for(i=0;i<c->stream->nb_streams;i++) {
-                        if (c->feed_streams[i] == pkt.stream_index) {
+                        if (c->stream->feed_streams[i] == pkt.stream_index) {
                             AVStream *st = c->fmt_in->streams[source_index];
                             pkt.stream_index = i;
                             if (pkt.flags & AV_PKT_FLAG_KEY &&



More information about the ffmpeg-cvslog mailing list