Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 11:20:08 +0000 (13:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 11:48:26 +0000 (13:48 +0200)
* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_compand.c

index 89430ac..4ca73c4 100644 (file)
@@ -278,7 +278,13 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
     s->delay_index = dindex;
 
     av_frame_free(&frame);
-    return out_frame ? ff_filter_frame(ctx->outputs[0], out_frame) : 0;
+
+    if (out_frame) {
+        err = ff_filter_frame(ctx->outputs[0], out_frame);
+        return err;
+    }
+
+    return 0;
 }
 
 static int compand_drain(AVFilterLink *outlink)
@@ -534,7 +540,7 @@ static int request_frame(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
     CompandContext *s    = ctx->priv;
-    int ret;
+    int ret = 0;
 
     ret = ff_request_frame(ctx->inputs[0]);