[FFmpeg-cvslog] avfilter/vf_histogram: Fix order of operations with flags

Michael Niedermayer git at videolan.org
Thu Sep 3 23:56:09 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep  3 23:02:03 2015 +0200| [c97ea011f57f7a42f249ff5c1d4d7b21c43dc104] | committer: Michael Niedermayer

avfilter/vf_histogram: Fix order of operations with flags

Fixes CID1322325

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c97ea011f57f7a42f249ff5c1d4d7b21c43dc104
---

 libavfilter/vf_histogram.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index e9df420..443cbda 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -180,7 +180,7 @@ static int query_formats(AVFilterContext *ctx)
         bits = desc->comp[0].depth_minus1;
         for (i = 1; i < avff->nb_formats; i++) {
             desc = av_pix_fmt_desc_get(avff->formats[i]);
-            if ((rgb != desc->flags & AV_PIX_FMT_FLAG_RGB) ||
+            if ((rgb != (desc->flags & AV_PIX_FMT_FLAG_RGB)) ||
                 (bits != desc->comp[0].depth_minus1))
                 return AVERROR(EAGAIN);
         }



More information about the ffmpeg-cvslog mailing list