[FFmpeg-cvslog] swscale: cosmetics in is{RGB,BGR}inInt

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Sun Mar 19 23:42:10 
2017 +0100| [e811f84a2ed05ed9ed22210d34969b989811da37] | committer: Clément 
Bœsch

swscale: cosmetics in is{RGB,BGR}inInt

Reduce diff with Libav.

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

 libswscale/swscale_internal.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index d567422..1e1d5fa 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -698,9 +698,8 @@ static av_always_inline int isGray(enum AVPixelFormat 
pix_fmt)
            pix_fmt != AV_PIX_FMT_MONOWHITE;
 }
 
-#define isRGBinInt(x) \
-    (           \
-     (x) == AV_PIX_FMT_RGB48BE     ||  \
+#define isRGBinInt(x)                  \
+    ((x) == AV_PIX_FMT_RGB48BE     ||  \
      (x) == AV_PIX_FMT_RGB48LE     ||  \
      (x) == AV_PIX_FMT_RGB32       ||  \
      (x) == AV_PIX_FMT_RGB32_1     ||  \
@@ -717,11 +716,10 @@ static av_always_inline int isGray(enum AVPixelFormat 
pix_fmt)
      (x) == AV_PIX_FMT_RGBA64BE    ||  \
      (x) == AV_PIX_FMT_RGBA64LE    ||  \
      (x) == AV_PIX_FMT_MONOBLACK   ||  \
-     (x) == AV_PIX_FMT_MONOWHITE   \
-    )
-#define isBGRinInt(x) \
-    (           \
-     (x) == AV_PIX_FMT_BGR48BE     ||  \
+     (x) == AV_PIX_FMT_MONOWHITE)
+
+#define isBGRinInt(x)                  \
+    ((x) == AV_PIX_FMT_BGR48BE     ||  \
      (x) == AV_PIX_FMT_BGR48LE     ||  \
      (x) == AV_PIX_FMT_BGR32       ||  \
      (x) == AV_PIX_FMT_BGR32_1     ||  \
@@ -738,8 +736,7 @@ static av_always_inline int isGray(enum AVPixelFormat 
pix_fmt)
      (x) == AV_PIX_FMT_BGRA64BE    ||  \
      (x) == AV_PIX_FMT_BGRA64LE    ||  \
      (x) == AV_PIX_FMT_MONOBLACK   ||  \
-     (x) == AV_PIX_FMT_MONOWHITE   \
-    )
+     (x) == AV_PIX_FMT_MONOWHITE)
 
 static av_always_inline int isBayer(enum AVPixelFormat pix_fmt)
 {

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog