X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=25e3c7ec614316745a4bfc711ca5f854162cdcd7;hb=f4bf04572d3749217a0ea15283eb797d9293a5ae;hp=7e6f5b21c5d87cb2131e07db8c32d91a636d19ea;hpb=794ecca1733a78908d56739db5b33c5ddcc41736;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 7e6f5b21..25e3c7ec 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -97,8 +97,7 @@ static int aacdec_post_select(__a_unused struct sched *s, void *context)
 	struct btr_node *btrn = fn->btrn;
 	struct private_aacdec_data *padd = fn->private_data;
 	int i, ret;
-	char *p, *inbuf, *outbuffer;
-	char *btr_buf;
+	char *inbuf, *outbuf, *btrbuf;
 	size_t len, consumed, loaded;
 
 next_buffer:
@@ -130,11 +129,10 @@ next_buffer:
 	}
 	if (consumed >= len)
 		goto success;
-	p = inbuf + consumed;
 	//PARA_CRIT_LOG("consumed: %zu (%zu + %zu), have: %zu\n", padd->consumed_total + consumed,
 	//	padd->consumed_total, consumed, len - consumed);
-	outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info,
-		(unsigned char *)p, len - consumed);
+	outbuf = NeAACDecDecode(padd->handle, &padd->frame_info,
+		(unsigned char *)inbuf + consumed, len - consumed);
 	if (padd->frame_info.error) {
 		int err = padd->frame_info.error;
 		ret = -E_AAC_DECODE;
@@ -155,14 +153,14 @@ next_buffer:
 	consumed += padd->frame_info.bytesconsumed;
 	if (!padd->frame_info.samples)
 		goto success;
-	btr_buf = para_malloc(2 * padd->frame_info.samples);
+	btrbuf = para_malloc(2 * padd->frame_info.samples);
 	loaded = 0;
 	for (i = 0; i < padd->frame_info.samples; i++) {
-		short sh = ((short *)outbuffer)[i];
-		write_int16_host_endian(btr_buf + loaded, sh);
+		short sh = ((short *)outbuf)[i];
+		write_int16_host_endian(btrbuf + loaded, sh);
 		loaded += 2;
 	}
-	btr_add_output(btr_buf, loaded, btrn);
+	btr_add_output(btrbuf, loaded, btrn);
 success:
 	ret = consumed;
 	padd->consumed_total += ret;