Commit 7e24aa0c authored by Baptiste Coudurier's avatar Baptiste Coudurier

adjust write index if not set

Originally committed as revision 18097 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a9c6fc7b
...@@ -2419,6 +2419,8 @@ static int http_start_receive_data(HTTPContext *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)); http_log("Error reading write index from feed file: %s\n", strerror(errno));
return -1; 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); c->stream->feed_size = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
...@@ -3560,7 +3562,7 @@ static void build_feed_streams(void) ...@@ -3560,7 +3562,7 @@ static void build_feed_streams(void)
exit(1); 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); feed->feed_size = lseek(fd, 0, SEEK_END);
/* ensure that we do not wrap before the end of file */ /* ensure that we do not wrap before the end of file */
if (feed->feed_max_size && feed->feed_max_size < feed->feed_size) if (feed->feed_max_size && feed->feed_max_size < feed->feed_size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment