From 3feb0ebd680880568a71f86d00ecbccf24e12bad Mon Sep 17 00:00:00 2001 From: kostya Date: Tue, 24 Oct 2006 05:02:33 +0000 Subject: 16-bit grayscale support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20427 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_internal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libswscale/swscale_internal.h') 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: -- cgit v1.2.3