Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'

[ffmpeg] / libavfilter / vf_mergeplanes.c

diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c
index 6fec816a4a56cdcb10736aa83f9f4c0ead49b607..c76e82a4198b947674eee6f28d03bcc21c02153a 100644 (file)
--- a/libavfilter/vf_mergeplanes.c
+++ b/libavfilter/vf_mergeplanes.c
@@ -120,7 +120,7 @@ static int query_formats(AVFilterContext *ctx)
     int i;
 
     s->outdesc = av_pix_fmt_desc_get(s->out_fmt);
-    for (i = 0; i < AV_PIX_FMT_NB; i++) {
+    for (i = 0; av_pix_fmt_desc_get(i); i++) {
         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
         if (desc->comp[0].depth_minus1 == s->outdesc->comp[0].depth_minus1 &&
             av_pix_fmt_count_planes(i) == desc->nb_components)