RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

ffserver: cleanup

Browse Source 
remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.
(cherry picked from commit 305ca590cf)
This commit is contained in:
Reinhard Tartler 2011-01-23 08:53:40 +01:00 committed by Michael Niedermayer
parent eddf8f4100
commit bf7aa642c3
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffserver.c
View File

@ -1192,19 +1192,6 @@ static int modify_current_stream(HTTPContext *c, char *rates)
return action_required;
}
static void do_switch_stream(HTTPContext *c, int i)
{
if (c->switch_feed_streams[i] >= 0) {
#ifdef PHILIP
c->feed_streams[i] = c->switch_feed_streams[i];
#endif
/* Now update the stream */
}
c->switch_feed_streams[i] = -1;
}
/* XXX: factorize in utils.c ? */
/* XXX: take care with different space meaning */
static void skip_spaces(const char **pp)
@ -1578,7 +1565,7 @@ static int http_parse_request(HTTPContext *c)
if (modify_current_stream(c, ratebuf)) {
for (i = 0; i < FF_ARRAY_ELEMS(c->feed_streams); i++) {
if (c->switch_feed_streams[i] >= 0)
do_switch_stream(c, i);
c->switch_feed_streams[i] = -1;
}
}
}
@ -2349,7 +2336,7 @@ static int http_prepare_data(HTTPContext *c)
for(i=0;i<c->stream->nb_streams;i++) {
if (c->switch_feed_streams[i] == pkt.stream_index)
if (pkt.flags & AV_PKT_FLAG_KEY)
do_switch_stream(c, i);
c->switch_feed_streams[i] = -1;
if (c->switch_feed_streams[i] >= 0)
c->switch_pending = 1;
}