aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-05-24 20:08:02 +0000
committerMartin Storsjö <martin@martin.st>2010-05-24 20:08:02 +0000
commita5ba4cedf22b59f6a0b9b74256539f614b582e8d (patch)
tree1badcccbada25c11e0a517745c67fa3e8ea19690
parente175b55edf725aca32209ce5ce887c0ae7cb6b51 (diff)
downloadffmpeg-a5ba4cedf22b59f6a0b9b74256539f614b582e8d.tar.gz
ffserver: Fix streaming with more than one stream
Fix by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index f9606470bb..c82c73ae34 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2346,7 +2346,7 @@ static int http_prepare_data(HTTPContext *c)
}
}
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 &&