From: Michael Niedermayer Date: Wed, 26 Feb 2014 11:50:54 +0000 (+0100) Subject: avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c X-Git-Tag: android-x86-6.0-r1~6984 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=619d6b8f55cede83a4d89bf657a9f5a93858292d;p=android-x86%2Fexternal-ffmpeg.git avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer --- diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 6ad4ff3973..10f7f0953e 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -344,14 +344,14 @@ static int config_output(AVFilterLink *outlink) return AVERROR(EINVAL); } - if ((nb_attacks > outlink->channels) || (nb_decays > outlink->channels)) { + if ((nb_attacks > channels) || (nb_decays > channels)) { av_log(ctx, AV_LOG_ERROR, "Number of attacks/decays bigger than number of channels.\n"); return AVERROR(EINVAL); } uninit(ctx); - s->channels = av_mallocz_array(outlink->channels, sizeof(*s->channels)); + s->channels = av_mallocz_array(channels, sizeof(*s->channels)); s->nb_segments = (nb_points + 4) * 2; s->segments = av_mallocz_array(s->nb_segments, sizeof(*s->segments)); @@ -486,7 +486,7 @@ static int config_output(AVFilterLink *outlink) s->in_min_lin = exp(s->segments[1].x); s->out_min_lin = exp(s->segments[1].y); - for (i = 0; i < outlink->channels; i++) { + for (i = 0; i < channels; i++) { ChanParam *cp = &s->channels[i]; if (cp->attack > 1.0 / sample_rate)