RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 18:55:08 +00:00
Code Issues Projects Releases Wiki Activity

avfilter:audio: fix shadowed AVFrame *out

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-10-06 09:50:30 +02:00
parent d1c8368e40
commit 755242b912
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/af_agate.c
View File

@ -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);

4
libavfilter/af_stereotools.c
View File

@ -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)
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);

4
libavfilter/af_stereowiden.c
View File

@ -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);