aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-11-24 12:21:03 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2011-11-24 12:21:03 -0800
commitf7f1835258595596b7493d3add8c6a2f7f2cdcde (patch)
tree6b84f1d9ac34165cc5f8ab46a7087b7b5f8d988a /libswscale
parent185655c601cd893866fee42acab19a481f44941e (diff)
downloadffmpeg-f7f1835258595596b7493d3add8c6a2f7f2cdcde.tar.gz
swscale: fix failing fate tests.
isGray() is left as a FIXME for later.
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_internal.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index b20e0a34e0..7bfdc7eb6b 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -552,9 +552,18 @@ const char *sws_format_name(enum PixelFormat format);
#define isRGB(x) \
(av_pix_fmt_descriptors[x].flags & PIX_FMT_RGB)
+#if 0 // FIXME
#define isGray(x) \
(!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \
av_pix_fmt_descriptors[x].nb_components <= 2)
+#else
+#define isGray(x) ( \
+ (x)==PIX_FMT_GRAY8 \
+ || (x)==PIX_FMT_Y400A \
+ || (x)==PIX_FMT_GRAY16BE \
+ || (x)==PIX_FMT_GRAY16LE \
+ )
+#endif
#define isRGBinInt(x) ( \
(x)==PIX_FMT_RGB48BE \