[FFmpeg-cvslog] lavfi/aevalsrc: remove limitation on the number of channels

Stefano Sabatini git at videolan.org
Fri May 18 01:01:53 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed May 16 19:35:56 2012 +0200| [cfde7395b1bf4b1b9c37b9fbee76a2e9b61fe55a] | committer: Stefano Sabatini

lavfi/aevalsrc: remove limitation on the number of channels

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfde7395b1bf4b1b9c37b9fbee76a2e9b61fe55a
---

 libavfilter/asrc_aevalsrc.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
index 6c9022b..41ccda9 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);
         }
     }



More information about the ffmpeg-cvslog mailing list