]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 20:01:59 +0000 (22:01 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 20:01:59 +0000 (22:01 +0200)
1  2 
fecdec_filter.c

diff --combined fecdec_filter.c
index ca9dcd739e23c6fe7e89d4ff67cec41686906318,a7290e6aa41a57570828c0968643c760a4e2e38e..63510e8fd5cdf72fafee6e74b37fba4e770417e8
@@@ -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;