ffmpeg | branch: master | Lior Mualem <li...@users.noreply.github.com> | Mon Mar 7 18:08:19 2016 +0200| [baec6d8affc6ccebb54f375f6d107495ae6720d3] | committer: Michael Niedermayer
ffserver: Fixed ffserver to support large ffm files ffm_read_write_index returns a 64bit value, Github: Closes #185 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=baec6d8affc6ccebb54f375f6d107495ae6720d3 --- ffserver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ffserver.c b/ffserver.c index 374af99..5821870 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), _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
