[SCM] libav/experimental: if feeder is disconnected, clear the feed registration, thus a new feeder can connect

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:44 UTC 2013


The following commit has been merged in the experimental branch:
commit 5400e0923ab989a1bf377f1aa48c0f1ed6c3ac91
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Thu Feb 22 13:27:39 2007 +0000

    if feeder is disconnected, clear the feed registration, thus a new feeder can connect
    
    Originally committed as revision 8072 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffserver.c b/ffserver.c
index 94751e7..ba87f35 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -762,6 +762,13 @@ static void close_connection(HTTPContext *c)
 
     if (c->stream && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE)
         current_bandwidth -= c->stream->bandwidth;
+
+    /* signal that there is no feed if we are the feeder socket */
+    if (c->state == HTTPSTATE_RECEIVE_DATA && c->stream) {
+        c->stream->feed_opened = 0;
+        close(c->feed_fd);
+    }
+
     av_freep(&c->pb_buffer);
     av_freep(&c->packet_buffer);
     av_free(c->buffer);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list