Commit baec6d8a authored by Lior Mualem's avatar Lior Mualem Committed by Michael Niedermayer

ffserver: Fixed ffserver to support large ffm files

ffm_read_write_index returns a 64bit value,

Github: Closes #185
parent f2bdf9d2
......@@ -2622,6 +2622,7 @@ static int http_start_receive_data(HTTPContext *c)
{
int fd;
int ret;
int64_t ret64;
if (c->stream->feed_opened) {
http_log("Stream feed '%s' was not opened\n",
......@@ -2657,13 +2658,13 @@ static int http_start_receive_data(HTTPContext *c)
return ret;
}
} else {
ret = ffm_read_write_index(fd);
if (ret < 0) {
ret64 = ffm_read_write_index(fd);
if (ret64 < 0) {
http_log("Error reading write index from feed file '%s': %s\n",
c->stream->feed_filename, strerror(errno));
return ret;
return ret64;
}
c->stream->feed_write_index = ret;
c->stream->feed_write_index = ret64;
}
c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd),
......
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