From 687e7aa9abf91f1bade59213a8b53f9bb4ec4186 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 10 May 2017 22:52:21 +0200 Subject: Fix errors from the latest commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/stream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/stream.c') diff --git a/src/stream.c b/src/stream.c index 274ed25..7920ff7 100644 --- a/src/stream.c +++ b/src/stream.c @@ -279,17 +279,18 @@ enread_segment(int status, struct stream *stream, void *buf, size_t n) size_t ensend_frames(int status, struct stream *stream, int outfd, size_t frames, const char *outfname) { - size_t h, w, p; + size_t h, w, p, n; size_t ret = 0; for (ret = 0; ret < frames; ret++) { for (p = stream->pixel_size; p; p--) { for (h = stream->height; h; h--) { - for (w = stream->width; w; w -= stream->ptr, stream->ptr = 0) { + for (w = stream->width; w; w -= n, stream->ptr -= n) { if (!stream->ptr && !enread_stream(status, stream, w)) goto done; + n = MIN(stream->ptr, w); if (outfd >= 0) - enwriteall(status, outfd, stream->buf, stream->ptr, outfname); + enwriteall(status, outfd, stream->buf, n, outfname); } } } -- cgit v1.2.3-70-g09d2