git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e175b55
)
ffserver: Fix streaming with more than one stream
author
Martin Storsjö
<martin@martin.st>
Mon, 24 May 2010 20:08:02 +0000
(20:08 +0000)
committer
Martin Storsjö
<martin@martin.st>
Mon, 24 May 2010 20:08:02 +0000
(20:08 +0000)
Fix by Howard Chu, hyc at highlandsun dot com
Originally committed as revision 23294 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
f960647
..
c82c73a
100644
(file)
--- 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 &&