summaryrefslogtreecommitdiffstats
path: root/sbc/sbcenc.c
diff options
context:
space:
mode:
authorChristian Hoene <hoene@ieee.org>2009-01-05 13:26:08 +0100
committerMarcel Holtmann <marcel@holtmann.org>2009-01-06 03:41:57 +0100
commit2cada66773cb8cf3a95d571fbed669a994bac2e0 (patch)
treea1d0200ad41934a513bc80573a66ddac7fd35828 /sbc/sbcenc.c
parent365f92ed452f021d4f372220d1e8ea5076dda81a (diff)
Fixed correct handling of frame sizes in the encoder
Diffstat (limited to 'sbc/sbcenc.c')
-rw-r--r--sbc/sbcenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbc/sbcenc.c b/sbc/sbcenc.c
index 2a8066ec..9cbfb871 100644
--- a/sbc/sbcenc.c
+++ b/sbc/sbcenc.c
@@ -47,7 +47,7 @@ static ssize_t __read(int fd, void *buf, size_t count)
while (count > 0) {
len = read(fd, buf + pos, count);
if (len <= 0)
- return len;
+ return pos > len ? pos : len;
count -= len;
pos += len;
@@ -188,6 +188,8 @@ static void encode(char *filename, int subbands, int bitpool, int joint,
len = sbc_encode(&sbc, input, size,
output, sizeof(output), &encoded);
+ if (len <= 0)
+ break;
if (len < size)
memmove(input, input + len, size - len);