From cd5f50a255321a6917f7a465cd1159fe4fc4948e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 15 Mar 2013 16:13:53 +0100 Subject: [PATCH] avfilter: avoid direct access to AVFrame.channels Signed-off-by: Michael Niedermayer --- libavfilter/af_aconvert.c | 2 +- libavfilter/af_afade.c | 4 ++-- libavfilter/af_amerge.c | 2 +- libavfilter/af_apad.c | 2 +- libavfilter/af_aresample.c | 2 +- libavfilter/af_biquads.c | 2 +- libavfilter/af_pan.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c index 2cf12e3308..c05e5719a3 100644 --- a/libavfilter/af_aconvert.c +++ b/libavfilter/af_aconvert.c @@ -147,7 +147,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref) (void *)insamplesref->extended_data, n); av_frame_copy_props(outsamplesref, insamplesref); - outsamplesref->channels = outlink->channels; + av_frame_set_channels(outsamplesref, outlink->channels); outsamplesref->channel_layout = outlink->channel_layout; ret = ff_filter_frame(outlink, outsamplesref); diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 0e660a3f4c..1134849282 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -256,7 +256,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) if ((!afade->type && (cur_sample + nb_samples < afade->start_sample)) || ( afade->type && (afade->start_sample + afade->nb_samples < cur_sample))) { av_samples_set_silence(out_buf->extended_data, 0, nb_samples, - out_buf->channels, out_buf->format); + av_frame_get_channels(out_buf), out_buf->format); } else { int64_t start; @@ -266,7 +266,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) start = afade->start_sample + afade->nb_samples - cur_sample; afade->fade_samples(out_buf->extended_data, buf->extended_data, - nb_samples, buf->channels, + nb_samples, av_frame_get_channels(buf), afade->type ? -1 : 1, start, afade->nb_samples, afade->curve); } diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index b26141d14f..28c368215f 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -263,7 +263,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) outbuf->nb_samples = nb_samples; outbuf->channel_layout = outlink->channel_layout; - outbuf->channels = outlink->channels; + av_frame_set_channels(outbuf, outlink->channels); while (nb_samples) { ns = nb_samples; diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c index b3a4b95e81..b4a0fc8509 100644 --- a/libavfilter/af_apad.c +++ b/libavfilter/af_apad.c @@ -122,7 +122,7 @@ static int request_frame(AVFilterLink *outlink) av_samples_set_silence(outsamplesref->extended_data, 0, n_out, - outsamplesref->channels, + av_frame_get_channels(outsamplesref), outsamplesref->format); outsamplesref->pts = apad->next_pts; diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index be1e4b75dc..80351c3825 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -188,7 +188,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref) av_frame_copy_props(outsamplesref, insamplesref); outsamplesref->format = outlink->format; - outsamplesref->channels = outlink->channels; + av_frame_set_channels(outsamplesref, outlink->channels); outsamplesref->channel_layout = outlink->channel_layout; outsamplesref->sample_rate = outlink->sample_rate; diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 6384090d4c..0bd61fda32 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -409,7 +409,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) out_buf->pts = buf->pts; } - for (ch = 0; ch < buf->channels; ch++) + for (ch = 0; ch < av_frame_get_channels(buf); ch++) p->filter(buf->extended_data[ch], out_buf->extended_data[ch], nb_samples, &p->cache[ch].i1, &p->cache[ch].i2, diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 9a3c10c1dc..ae2e0aa481 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -364,7 +364,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) swr_convert(pan->swr, outsamples->data, n, (void *)insamples->data, n); av_frame_copy_props(outsamples, insamples); outsamples->channel_layout = outlink->channel_layout; - outsamples->channels = outlink->channels; + av_frame_set_channels(outsamples, outlink->channels); ret = ff_filter_frame(outlink, outsamples); av_frame_free(&insamples);