summaryrefslogtreecommitdiff
path: root/libswscale/swscale_internal.h
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2006-10-24 05:02:33 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2006-10-24 05:02:33 +0000
commit4884b9e50d416f84e64bfaf546a03e490cb83a2f (patch)
tree54ea75c12daf331889f7cf50d723061d1c607c9a /libswscale/swscale_internal.h
parent9efe56f691dc4c6439f641040649df77b3deec43 (diff)
16-bit grayscale support
Originally committed as revision 20427 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale_internal.h')
-rw-r--r--libswscale/swscale_internal.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index ecd28f5ff4..dbeee7d978 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -181,7 +181,8 @@ char *sws_format_name(int format);
|| (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)
+#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 \
@@ -204,6 +205,8 @@ static inline int fmt_depth(int fmt)
return 24;
case PIX_FMT_BGR565:
case PIX_FMT_RGB565:
+ case PIX_FMT_GRAY16BE:
+ case PIX_FMT_GRAY16LE:
return 16;
case PIX_FMT_BGR555:
case PIX_FMT_RGB555: