[FFmpeg-cvslog] ffserver: cleanup

[Reinhard Tartler]

ffmpeg | branch: master | Reinhard Tartler <siretart at tauware.de> | Sun Jan 23 08:53:40 2011 +0100| [bf7aa642c358148a693354777a1b3f12d5affdaa] | committer: Michael Niedermayer

ffserver: cleanup

remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.
(cherry picked from commit 305ca590cfdbb8ffbe32c6ed26825489a640ff05)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf7aa642c358148a693354777a1b3f12d5affdaa
---

 ffserver.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 89e8e95..94a239c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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;
                         }