ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Thu Aug 18 18:40:00 2016 +0200| [b3c6e89d4871d4f6afada96d8695e0ef08c6f02b] | committer: Paul B Mahol
avfilter/avf_showspectrum: do not use uninitialized memory > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3c6e89d4871d4f6afada96d8695e0ef08c6f02b --- libavfilter/avf_showspectrum.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 5741a1e..e65db4f 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -380,7 +380,7 @@ static int config_output(AVFilterLink *outlink) if (!s->color_buffer) return AVERROR(ENOMEM); for (i = 0; i < s->nb_display_channels; i++) { - s->color_buffer[i] = av_malloc_array(s->orientation == VERTICAL ? s->h * 3 : s->w * 3, sizeof(**s->color_buffer)); + s->color_buffer[i] = av_calloc(s->orientation == VERTICAL ? s->h * 3 : s->w * 3, sizeof(**s->color_buffer)); if (!s->color_buffer[i]) return AVERROR(ENOMEM); } @@ -730,8 +730,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) ctx->internal->execute(ctx, plot_channel, NULL, NULL, s->nb_display_channels); for (y = 0; y < z * 3; y++) { - s->combine_buffer[y] += s->color_buffer[0][y]; - for (x = 1; x < s->nb_display_channels; x++) { + for (x = 0; x < s->nb_display_channels; x++) { s->combine_buffer[y] += s->color_buffer[x][y]; } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
