Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'

[ffmpeg] / libavfilter / af_hdcd.c

diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 91f84aea22577201f491306f548c9a9ecea89015..1248fd9b758975acccc2f9fabf03351e077bae9f 100644 (file)
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -867,7 +867,7 @@ typedef struct {
      *  steps of 0.5, but no value below -6.0 dB should appear. */
     int gain_counts[16];
     int max_gain;
-    /** occurences of code detect timer expiring without detecting
+    /** occurrences of code detect timer expiring without detecting
      *  a code. -1 for timer never set. */
     int count_sustain_expired;
 
@@ -1635,13 +1635,11 @@ static int query_formats(AVFilterContext *ctx)
         return ret;
 
     in_formats = ff_make_format_list(sample_fmts_in);
-    out_formats = ff_make_format_list(sample_fmts_out);
-    if (!in_formats || !out_formats)
-        return AVERROR(ENOMEM);
-
     ret = ff_formats_ref(in_formats, &inlink->out_formats);
     if (ret < 0)
         return ret;
+
+    out_formats = ff_make_format_list(sample_fmts_out);
     ret = ff_formats_ref(out_formats, &outlink->in_formats);
     if (ret < 0)
         return ret;