swscale: use a function for isAnyRGB

2b9a52bc · Clément Bœsch · c30875e8 · 2b9a52bc
Commit 2b9a52bc authored Mar 19, 2017 by Clément Bœsch
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

swscale_internal.h libswscale/swscale_internal.h +7 -7

No files found.
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -767,13 +767,13 @@ static av_always_inline int isBayer(enum AVPixelFormat pix_fmt)
    return !!(desc->flags & AV_PIX_FMT_FLAG_BAYER);
 }
-#define isAnyRGB(x) \
+static av_always_inline int isAnyRGB(enum AVPixelFormat pix_fmt)
-    (           \
+{
-          isBayer(x)          ||    \
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
-          isRGBinInt(x)       ||    \
+    av_assert0(desc);
-          isBGRinInt(x)       ||    \
+    return (desc->flags & AV_PIX_FMT_FLAG_RGB) ||
-          isRGB(x)      \
+            pix_fmt == AV_PIX_FMT_MONOBLACK || pix_fmt == AV_PIX_FMT_MONOWHITE;
-    )
+}
 static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt)
 {