Merge commit '5b6213ef6bf5e0781c83e86926eb0b33a98dc185'

[ffmpeg] / libavfilter / af_headphone.c

diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c
index 3b76d1d73705440e8f6baf2fbcb52b933325198c..2188f7ab24f565e7539b2eb8f467ffdfe4ccaef1 100644 (file)
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@@ -324,16 +324,19 @@ static int read_ir(AVFilterLink *inlink, AVFrame *frame)
 {
     AVFilterContext *ctx = inlink->dst;
     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++)
         if (inlink == ctx->inputs[input_number])
             break;
 
-    av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data,
-                        frame->nb_samples);
+    ret = av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data,
+                             frame->nb_samples);
     av_frame_free(&frame);
 
+    if (ret < 0)
+        return ret;
+
     ir_len = av_audio_fifo_size(s->in[input_number].fifo);
     max_ir_len = 65536;
     if (ir_len > max_ir_len) {
@@ -572,13 +575,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     AVFilterLink *outlink = ctx->outputs[0];
     int ret = 0;
 
-    av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
-                        in->nb_samples);
+    ret = av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
+                             in->nb_samples);
     if (s->pts == AV_NOPTS_VALUE)
         s->pts = in->pts;
 
     av_frame_free(&in);
 
+    if (ret < 0)
+        return ret;
+
     if (!s->have_hrirs && s->eof_hrirs) {
         ret = convert_coeffs(ctx, inlink);
         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) {
             ret = headphone_frame(s, outlink);
             if (ret < 0)
-                break;
+                return ret;
         }
     }
-    return ret;
+
+    return 0;
 }
 
 static int query_formats(AVFilterContext *ctx)