# HG changeset patch
# User ivo
# Date 1178882646 0
# Node ID b745a8414f2ce4195954d1efe519f2893ae59c82
# Parent  32873ccfb00789df4f3939bd64c56f7e1b7795e2
cosmetics; one test per line for all isXXX(x) macros

diff -r 32873ccfb007 -r b745a8414f2c libswscale/swscale.c
--- a/libswscale/swscale.c	Fri May 11 07:51:42 2007 +0000
+++ b/libswscale/swscale.c	Fri May 11 11:24:06 2007 +0000
@@ -102,22 +102,54 @@
 #define PI 3.14159265358979323846
 #endif
 
-#define isSupportedIn(x)  ((x)==PIX_FMT_YUV420P   || (x)==PIX_FMT_YUYV422 || (x)==PIX_FMT_UYVY422 \
-                        || (x)==PIX_FMT_RGB32     || (x)==PIX_FMT_BGR24   || (x)==PIX_FMT_BGR565 || (x)==PIX_FMT_BGR555 \
-                        || (x)==PIX_FMT_BGR32     || (x)==PIX_FMT_RGB24   || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
-                        || (x)==PIX_FMT_GRAY8     || (x)==PIX_FMT_YUV410P  \
-                        || (x)==PIX_FMT_GRAY16BE  || (x)==PIX_FMT_GRAY16LE \
-                        || (x)==PIX_FMT_YUV444P   || (x)==PIX_FMT_YUV422P || (x)==PIX_FMT_YUV411P \
-                        || (x)==PIX_FMT_PAL8      || (x)==PIX_FMT_BGR8    || (x)==PIX_FMT_RGB8 \
-                        || (x)==PIX_FMT_BGR4_BYTE || (x)==PIX_FMT_RGB4_BYTE)
-#define isSupportedOut(x) ((x)==PIX_FMT_YUV420P  || (x)==PIX_FMT_YUYV422 || (x)==PIX_FMT_UYVY422 \
-                        || (x)==PIX_FMT_YUV444P  || (x)==PIX_FMT_YUV422P || (x)==PIX_FMT_YUV411P \
-                        || isRGB(x) || isBGR(x) \
-                        || (x)==PIX_FMT_NV12     || (x)==PIX_FMT_NV21 \
-                        || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE \
-                        || (x)==PIX_FMT_GRAY8    || (x)==PIX_FMT_YUV410P)
-#define isPacked(x)    ((x)==PIX_FMT_PAL8    || (x)==PIX_FMT_YUYV422 || \
-                        (x)==PIX_FMT_UYVY422 || isRGB(x) || isBGR(x))
+#define isSupportedIn(x)    (       \
+           (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_RGB32       \
+        || (x)==PIX_FMT_BGR24       \
+        || (x)==PIX_FMT_BGR565      \
+        || (x)==PIX_FMT_BGR555      \
+        || (x)==PIX_FMT_BGR32       \
+        || (x)==PIX_FMT_RGB24       \
+        || (x)==PIX_FMT_RGB565      \
+        || (x)==PIX_FMT_RGB555      \
+        || (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_YUV410P     \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || (x)==PIX_FMT_PAL8        \
+        || (x)==PIX_FMT_BGR8        \
+        || (x)==PIX_FMT_RGB8        \
+        || (x)==PIX_FMT_BGR4_BYTE   \
+        || (x)==PIX_FMT_RGB4_BYTE   \
+    )
+#define isSupportedOut(x)   (       \
+           (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || isRGB(x)                 \
+        || isBGR(x)                 \
+        || (x)==PIX_FMT_NV12        \
+        || (x)==PIX_FMT_NV21        \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+        || (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_YUV410P     \
+    )
+#define isPacked(x)         (       \
+           (x)==PIX_FMT_PAL8        \
+        || (x)==PIX_FMT_YUYV422     \
+        || (x)==PIX_FMT_UYVY422     \
+        || isRGB(x)                 \
+        || isBGR(x)                 \
+    )
 
 #define RGB2YUV_SHIFT 16
 #define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5))
diff -r 32873ccfb007 -r b745a8414f2c libswscale/swscale_internal.h
--- a/libswscale/swscale_internal.h	Fri May 11 07:51:42 2007 +0000
+++ b/libswscale/swscale_internal.h	Fri May 11 11:24:06 2007 +0000
@@ -171,21 +171,49 @@
 char *sws_format_name(int format);
 
 //FIXME replace this with something faster
-#define isPlanarYUV(x) ((x)==PIX_FMT_YUV410P  || (x)==PIX_FMT_YUV420P \
-                     || (x)==PIX_FMT_YUV411P  || (x)==PIX_FMT_YUV422P \
-                     || (x)==PIX_FMT_YUV444P  || (x)==PIX_FMT_NV12    \
-                     || (x)==PIX_FMT_NV21)
-#define isYUV(x)       ((x)==PIX_FMT_UYVY422  || (x)==PIX_FMT_YUYV422  || isPlanarYUV(x))
-#define isGray(x)      ((x)==PIX_FMT_GRAY8    || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isGray16(x)    ((x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isRGB(x)       ((x)==PIX_FMT_BGR32    || (x)==PIX_FMT_RGB24   \
-                     || (x)==PIX_FMT_RGB565   || (x)==PIX_FMT_RGB555  \
-                     || (x)==PIX_FMT_RGB8     || (x)==PIX_FMT_RGB4 || (x)==PIX_FMT_RGB4_BYTE \
-                     || (x)==PIX_FMT_MONOBLACK)
-#define isBGR(x)       ((x)==PIX_FMT_RGB32    || (x)==PIX_FMT_BGR24   \
-                     || (x)==PIX_FMT_BGR565   || (x)==PIX_FMT_BGR555  \
-                     || (x)==PIX_FMT_BGR8     || (x)==PIX_FMT_BGR4 || (x)==PIX_FMT_BGR4_BYTE \
-                     || (x)==PIX_FMT_MONOBLACK)
+#define isPlanarYUV(x)  (           \
+           (x)==PIX_FMT_YUV410P     \
+        || (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_NV12        \
+        || (x)==PIX_FMT_NV21        \
+    )
+#define isYUV(x)        (           \
+           (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_YUYV422     \
+        || isPlanarYUV(x)           \
+    )
+#define isGray(x)       (           \
+           (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isGray16(x)     (           \
+           (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isRGB(x)        (           \
+           (x)==PIX_FMT_BGR32       \
+        || (x)==PIX_FMT_RGB24       \
+        || (x)==PIX_FMT_RGB565      \
+        || (x)==PIX_FMT_RGB555      \
+        || (x)==PIX_FMT_RGB8        \
+        || (x)==PIX_FMT_RGB4        \
+        || (x)==PIX_FMT_RGB4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
+#define isBGR(x)        (           \
+           (x)==PIX_FMT_RGB32       \
+        || (x)==PIX_FMT_BGR24       \
+        || (x)==PIX_FMT_BGR565      \
+        || (x)==PIX_FMT_BGR555      \
+        || (x)==PIX_FMT_BGR8        \
+        || (x)==PIX_FMT_BGR4        \
+        || (x)==PIX_FMT_BGR4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
 
 static inline int fmt_depth(int fmt)
 {