virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/af_headphone: add missing error check

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-11-20 13:37:24 +01:00
parent d1b284119b
commit 4073046089
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/af_headphone.c
View File

@ -324,16 +324,19 @@ static int read_ir(AVFilterLink *inlink, AVFrame *frame)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
HeadphoneContext *s = ctx->priv; HeadphoneContext *s = ctx->priv;
int ir_len, max_ir_len, input_number; int ir_len, max_ir_len, input_number, ret;
for (input_number = 0; input_number < s->nb_inputs; input_number++) for (input_number = 0; input_number < s->nb_inputs; input_number++)
if (inlink == ctx->inputs[input_number]) if (inlink == ctx->inputs[input_number])
break; break;
av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data, ret = av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data,
frame->nb_samples); frame->nb_samples);
av_frame_free(&frame); av_frame_free(&frame);
if (ret < 0)
return ret;
ir_len = av_audio_fifo_size(s->in[input_number].fifo); ir_len = av_audio_fifo_size(s->in[input_number].fifo);
max_ir_len = 65536; max_ir_len = 65536;
if (ir_len > max_ir_len) { if (ir_len > max_ir_len) {
@ -572,13 +575,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
int ret = 0; int ret = 0;
av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data, ret = av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
in->nb_samples); in->nb_samples);
if (s->pts == AV_NOPTS_VALUE) if (s->pts == AV_NOPTS_VALUE)
s->pts = in->pts; s->pts = in->pts;
av_frame_free(&in); av_frame_free(&in);
if (ret < 0)
return ret;
if (!s->have_hrirs && s->eof_hrirs) { if (!s->have_hrirs && s->eof_hrirs) {
ret = convert_coeffs(ctx, inlink); ret = convert_coeffs(ctx, inlink);
if (ret < 0) if (ret < 0)
@ -589,10 +595,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
while (av_audio_fifo_size(s->in[0].fifo) >= s->size) { while (av_audio_fifo_size(s->in[0].fifo) >= s->size) {
ret = headphone_frame(s, outlink); ret = headphone_frame(s, outlink);
if (ret < 0) if (ret < 0)
break; return ret;
} }
} }
return ret;
return 0;
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)