virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffserver: Fixed ffserver to support large ffm files

Browse Source 
ffm_read_write_index returns a 64bit value,

Github: Closes #185
This commit is contained in:
Lior Mualem 2016-03-07 18:08:19 +02:00 committed by Michael Niedermayer
parent f2bdf9d26a
commit baec6d8aff
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffserver.c
View File

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