X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=53a8853dfeb68696d953daa419784758be3fe970;hb=27c08870ba172782f6406045007b6ff32a4f7329;hp=ce3eb3bd93dc315afc91a01737a3a1a2195e1b36;hpb=8eb77a20423c3dcc44c4584a082e981391272cb2;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index ce3eb3bd..53a8853d 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG
@@ -56,7 +52,7 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 static void aacdec_open(struct filter_node *fn)
 {
 	NeAACDecConfigurationPtr c;
-	struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
+	struct private_aacdec_data *padd = zalloc(sizeof(*padd));
 
 	padd->handle = NeAACDecOpen();
 	c = NeAACDecGetCurrentConfiguration(padd->handle);
@@ -140,7 +136,7 @@ next_buffer:
 	consumed += frame_info.bytesconsumed;
 	if (!frame_info.samples)
 		goto success;
-	btrbuf = para_malloc(2 * frame_info.samples);
+	btrbuf = arr_alloc(2, frame_info.samples);
 	for (i = 0; i < frame_info.samples; i++) {
 		short sh = ((short *)outbuf)[i];
 		write_int16_host_endian(btrbuf + loaded, sh);