Commit 755242b9 authored by Paul B Mahol's avatar Paul B Mahol

avfilter:audio: fix shadowed AVFrame *out

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent d1c8368e
...@@ -158,14 +158,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -158,14 +158,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
const double attack_coeff = s->attack_coeff; const double attack_coeff = s->attack_coeff;
const double release_coeff = s->release_coeff; const double release_coeff = s->release_coeff;
const double level_in = s->level_in; const double level_in = s->level_in;
AVFrame *out = NULL; AVFrame *out;
double *dst; double *dst;
int n, c; int n, c;
if (av_frame_is_writable(in)) { if (av_frame_is_writable(in)) {
out = in; out = in;
} else { } else {
AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); out = ff_get_audio_buffer(inlink, in->nb_samples);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -145,7 +145,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -145,7 +145,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
const int phase_l = floor(s->phase_l + 0.5); const int phase_l = floor(s->phase_l + 0.5);
const int phase_r = floor(s->phase_r + 0.5); const int phase_r = floor(s->phase_r + 0.5);
double *buffer = s->buffer; double *buffer = s->buffer;
AVFrame *out = NULL; AVFrame *out;
double *dst; double *dst;
int nbuf = inlink->sample_rate * (FFABS(delay) / 1000.); int nbuf = inlink->sample_rate * (FFABS(delay) / 1000.);
int n; int n;
...@@ -154,7 +154,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -154,7 +154,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) { if (av_frame_is_writable(in)) {
out = in; out = in;
} else { } else {
AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); out = ff_get_audio_buffer(inlink, in->nb_samples);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -90,14 +90,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -90,14 +90,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
const float drymix = s->drymix; const float drymix = s->drymix;
const float crossfeed = s->crossfeed; const float crossfeed = s->crossfeed;
const float feedback = s->feedback; const float feedback = s->feedback;
AVFrame *out = NULL; AVFrame *out;
float *dst; float *dst;
int n; int n;
if (av_frame_is_writable(in)) { if (av_frame_is_writable(in)) {
out = in; out = in;
} else { } else {
AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); out = ff_get_audio_buffer(inlink, in->nb_samples);
if (!out) { if (!out) {
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment