Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'

[ffmpeg] / libavfilter / af_stereowiden.c

diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c
index 8f671cabf7b7641170256ec9bc44eb6cb2ee7e89..154a8b15386b670bbc6a77da4e2114e9ad5b3c32 100644 (file)
--- a/libavfilter/af_stereowiden.c
+++ b/libavfilter/af_stereowiden.c
@@ -55,15 +55,15 @@ static int query_formats(AVFilterContext *ctx)
 {
     AVFilterFormats *formats = NULL;
     AVFilterChannelLayouts *layout = NULL;
+    int ret;
 
-    ff_add_format(&formats, AV_SAMPLE_FMT_FLT);
-    ff_set_common_formats(ctx, formats);
-    ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO);
-    ff_set_common_channel_layouts(ctx, layout);
+    if ((ret = ff_add_format                 (&formats, AV_SAMPLE_FMT_FLT  )) < 0 ||
+        (ret = ff_set_common_formats         (ctx     , formats            )) < 0 ||
+        (ret = ff_add_channel_layout         (&layout , AV_CH_LAYOUT_STEREO)) < 0 ||
+        (ret = ff_set_common_channel_layouts (ctx     , layout             )) < 0)
+        return ret;
 
     formats = ff_all_samplerates();
-    if (!formats)
-        return AVERROR(ENOMEM);
     return ff_set_common_samplerates(ctx, formats);
 }
 
@@ -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);