Merge commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65'

[ffmpeg] / libavfilter / af_hdcd.c

diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index caee470c2ed6e6a2c8e46eedf29d6c3e52f33718..1248fd9b758975acccc2f9fabf03351e077bae9f 100644 (file)
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -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;