diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-10-06 09:50:30 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2015-10-06 09:54:45 +0200 |
| commit | 755242b9121331af71caf8b47517335c388d8511 (patch) | |
| tree | bf4419765da674324a88395cef3c1e822dac134a | |
| parent | d1c8368e403124aeea0e51607b11c199e8eaf0ff (diff) | |
| download | ffmpeg-755242b9121331af71caf8b47517335c388d8511.tar.gz | |
avfilter:audio: fix shadowed AVFrame *out
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavfilter/af_agate.c | 4 | ||||
| -rw-r--r-- | libavfilter/af_stereotools.c | 4 | ||||
| -rw-r--r-- | libavfilter/af_stereowiden.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 46ee226235..7781a9ca56 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -158,14 +158,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const double attack_coeff = s->attack_coeff; const double release_coeff = s->release_coeff; const double level_in = s->level_in; - AVFrame *out = NULL; + AVFrame *out; double *dst; int n, c; if (av_frame_is_writable(in)) { out = in; } else { - AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); + out = ff_get_audio_buffer(inlink, in->nb_samples); if (!out) { av_frame_free(&in); return AVERROR(ENOMEM); diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c index f4030b7c4e..6a3265d631 100644 --- a/libavfilter/af_stereotools.c +++ b/libavfilter/af_stereotools.c @@ -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_r = floor(s->phase_r + 0.5); double *buffer = s->buffer; - AVFrame *out = NULL; + AVFrame *out; double *dst; int nbuf = inlink->sample_rate * (FFABS(delay) / 1000.); int n; @@ -154,7 +154,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (av_frame_is_writable(in)) { out = in; } else { - AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); + out = ff_get_audio_buffer(inlink, in->nb_samples); if (!out) { av_frame_free(&in); return AVERROR(ENOMEM); diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c index 8f671cabf7..7c5f2d4923 100644 --- a/libavfilter/af_stereowiden.c +++ b/libavfilter/af_stereowiden.c @@ -90,14 +90,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const float drymix = s->drymix; const float crossfeed = s->crossfeed; const float feedback = s->feedback; - AVFrame *out = NULL; + AVFrame *out; float *dst; int n; if (av_frame_is_writable(in)) { out = in; } else { - AVFrame *out = ff_get_audio_buffer(inlink, in->nb_samples); + out = ff_get_audio_buffer(inlink, in->nb_samples); if (!out) { av_frame_free(&in); return AVERROR(ENOMEM); |