From: Andre Noll <maan@systemlinux.org>
Date: Tue, 6 Oct 2009 20:01:59 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~14
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=5000a12ad288893d494ccd04d061752ed022d1d0;hp=-c;p=paraslash.git

Merge branch 'maint'
---

5000a12ad288893d494ccd04d061752ed022d1d0
diff --combined fecdec_filter.c
index ca9dcd73,a7290e6a..63510e8f
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@@ -6,8 -6,6 +6,8 @@@
  
  /** \file fecdec_filter.c A filter that fec-decodes an audio stream. */
  
 +#include <regex.h>
 +
  #include <dirent.h>
  #include "para.h"
  #include "error.h"
@@@ -248,13 -246,13 +248,13 @@@ static int add_slice(char *buf, struct 
  	slice_num = fg->h.slice_num;
  	if (fg->num_slices == 0) {
  		fg->num_slices = fg->h.slices_per_group;
- 		fg->idx = malloc(fg->num_slices * sizeof(int));
- 		fg->data = malloc(fg->num_slices * sizeof(unsigned char *));
+ 		fg->idx = para_malloc(fg->num_slices * sizeof(int));
+ 		fg->data = para_malloc(fg->num_slices * sizeof(unsigned char *));
  		memset(fg->data, 0, fg->num_slices * sizeof(unsigned char *));
  	}
  	r = fg->num_received_slices;
  	fg->idx[r] = slice_num;
- 	fg->data[r] = malloc(fg->h.slice_bytes);
+ 	fg->data[r] = para_malloc(fg->h.slice_bytes);
  	memcpy(fg->data[r], buf, fg->h.slice_bytes);
  	fg->num_received_slices++;
  	return 1;