Revision bf7aa642
ffserver.c | ||
---|---|---|
1192 | 1192 |
return action_required; |
1193 | 1193 |
} |
1194 | 1194 |
|
1195 |
|
|
1196 |
static void do_switch_stream(HTTPContext *c, int i) |
|
1197 |
{ |
|
1198 |
if (c->switch_feed_streams[i] >= 0) { |
|
1199 |
#ifdef PHILIP |
|
1200 |
c->feed_streams[i] = c->switch_feed_streams[i]; |
|
1201 |
#endif |
|
1202 |
|
|
1203 |
/* Now update the stream */ |
|
1204 |
} |
|
1205 |
c->switch_feed_streams[i] = -1; |
|
1206 |
} |
|
1207 |
|
|
1208 | 1195 |
/* XXX: factorize in utils.c ? */ |
1209 | 1196 |
/* XXX: take care with different space meaning */ |
1210 | 1197 |
static void skip_spaces(const char **pp) |
... | ... | |
1578 | 1565 |
if (modify_current_stream(c, ratebuf)) { |
1579 | 1566 |
for (i = 0; i < FF_ARRAY_ELEMS(c->feed_streams); i++) { |
1580 | 1567 |
if (c->switch_feed_streams[i] >= 0) |
1581 |
do_switch_stream(c, i);
|
|
1568 |
c->switch_feed_streams[i] = -1;
|
|
1582 | 1569 |
} |
1583 | 1570 |
} |
1584 | 1571 |
} |
... | ... | |
2349 | 2336 |
for(i=0;i<c->stream->nb_streams;i++) { |
2350 | 2337 |
if (c->switch_feed_streams[i] == pkt.stream_index) |
2351 | 2338 |
if (pkt.flags & AV_PKT_FLAG_KEY) |
2352 |
do_switch_stream(c, i);
|
|
2339 |
c->switch_feed_streams[i] = -1;
|
|
2353 | 2340 |
if (c->switch_feed_streams[i] >= 0) |
2354 | 2341 |
c->switch_pending = 1; |
2355 | 2342 |
} |
Also available in: Unified diff