diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-05-16 19:35:56 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-05-18 00:38:31 +0200 |
| commit | cfde7395b1bf4b1b9c37b9fbee76a2e9b61fe55a (patch) | |
| tree | a8946e72a364ef837f52c4affb03749347893163 | |
| parent | 47ef2612889e369cc06b6fb4476386b80345babf (diff) | |
| download | ffmpeg-cfde7395b1bf4b1b9c37b9fbee76a2e9b61fe55a.tar.gz | |
lavfi/aevalsrc: remove limitation on the number of channels
| -rw-r--r-- | libavfilter/asrc_aevalsrc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c index 6c9022bb65..41ccda98c0 100644 --- a/libavfilter/asrc_aevalsrc.c +++ b/libavfilter/asrc_aevalsrc.c @@ -100,12 +100,6 @@ static int init(AVFilterContext *ctx, const char *args, void *opaque) buf = args1; i = 0; while (expr = av_strtok(buf, ":", &bufptr)) { - if (i >= 8) { - av_log(ctx, AV_LOG_ERROR, - "More than 8 expressions provided, unsupported.\n"); - ret = AVERROR(EINVAL); - return ret; - } ret = av_expr_parse(&eval->expr[i], expr, var_names, NULL, NULL, NULL, NULL, 0, ctx); if (ret < 0) @@ -214,7 +208,7 @@ static int request_frame(AVFilterLink *outlink) eval->var_values[VAR_T] = eval->var_values[VAR_N] * (double)1/eval->sample_rate; for (j = 0; j < eval->nb_channels; j++) { - *((double *) samplesref->data[j] + i) = + *((double *) samplesref->extended_data[j] + i) = av_expr_eval(eval->expr[j], eval->var_values, NULL); } } |