diff options
| author | Lior Mualem <liorm@users.noreply.github.com> | 2016-03-07 18:08:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-08 11:39:29 +0100 |
| commit | baec6d8affc6ccebb54f375f6d107495ae6720d3 (patch) | |
| tree | 38ae3bc4de040f85476e6673500640378bcf9029 /ffserver.c | |
| parent | f2bdf9d26a237c452dfaa9499027442790cafb4f (diff) | |
| download | ffmpeg-baec6d8affc6ccebb54f375f6d107495ae6720d3.tar.gz | |
ffserver: Fixed ffserver to support large ffm files
ffm_read_write_index returns a 64bit value,
Github: Closes #185
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 374af99cc7..5821870d2c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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), |