From 7e24aa0c13879963684400f9aad9df44c2614bd9 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 21 Mar 2009 06:52:55 +0000 Subject: [PATCH] adjust write index if not set Originally committed as revision 18097 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ffserver.c b/ffserver.c index fd25024..baefd78 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2419,6 +2419,8 @@ static int http_start_receive_data(HTTPContext *c) http_log("Error reading write index from feed file: %s\n", strerror(errno)); return -1; } + c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE); + c->stream->feed_size = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); @@ -3560,7 +3562,7 @@ static void build_feed_streams(void) exit(1); } - feed->feed_write_index = ffm_read_write_index(fd); + feed->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE); feed->feed_size = lseek(fd, 0, SEEK_END); /* ensure that we do not wrap before the end of file */ if (feed->feed_max_size && feed->feed_max_size < feed->feed_size) -- 2.7.4