virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

swscale: cosmetics in is{RGB,BGR}inInt

Browse Source 
Reduce diff with Libav.
This commit is contained in:
Clément Bœsch
2017-03-19 23:42:10 +01:00
parent d6635daded
commit e811f84a2e
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libswscale/swscale_internal.h
View File

@@ -699,8 +699,7 @@ static av_always_inline int isGray(enum AVPixelFormat pix_fmt)
} }
#define isRGBinInt(x) \ #define isRGBinInt(x) \
( \ ((x) == AV_PIX_FMT_RGB48BE || \
(x) == AV_PIX_FMT_RGB48BE || \
(x) == AV_PIX_FMT_RGB48LE || \ (x) == AV_PIX_FMT_RGB48LE || \
(x) == AV_PIX_FMT_RGB32 || \ (x) == AV_PIX_FMT_RGB32 || \
(x) == AV_PIX_FMT_RGB32_1 || \ (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_RGBA64BE || \
(x) == AV_PIX_FMT_RGBA64LE || \ (x) == AV_PIX_FMT_RGBA64LE || \
(x) == AV_PIX_FMT_MONOBLACK || \ (x) == AV_PIX_FMT_MONOBLACK || \
(x) == AV_PIX_FMT_MONOWHITE \ (x) == AV_PIX_FMT_MONOWHITE)
)
#define isBGRinInt(x) \ #define isBGRinInt(x) \
( \ ((x) == AV_PIX_FMT_BGR48BE || \
(x) == AV_PIX_FMT_BGR48BE || \
(x) == AV_PIX_FMT_BGR48LE || \ (x) == AV_PIX_FMT_BGR48LE || \
(x) == AV_PIX_FMT_BGR32 || \ (x) == AV_PIX_FMT_BGR32 || \
(x) == AV_PIX_FMT_BGR32_1 || \ (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_BGRA64BE || \
(x) == AV_PIX_FMT_BGRA64LE || \ (x) == AV_PIX_FMT_BGRA64LE || \
(x) == AV_PIX_FMT_MONOBLACK || \ (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) static av_always_inline int isBayer(enum AVPixelFormat pix_fmt)
{ {