diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 23:42:10 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 08:02:30 +0100 |
| commit | e811f84a2ed05ed9ed22210d34969b989811da37 (patch) | |
| tree | 136ae740f34438beec1954bab8e68f51cd4f7f6e /libswscale | |
| parent | d6635daded80d68b0cda767a8a19af4b6a41701f (diff) | |
| download | ffmpeg-e811f84a2ed05ed9ed22210d34969b989811da37.tar.gz | |
swscale: cosmetics in is{RGB,BGR}inInt
Reduce diff with Libav.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_internal.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index d5674227ed..1e1d5fa300 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -698,9 +698,8 @@ static av_always_inline int isGray(enum AVPixelFormat pix_fmt) pix_fmt != AV_PIX_FMT_MONOWHITE; } -#define isRGBinInt(x) \ - ( \ - (x) == AV_PIX_FMT_RGB48BE || \ +#define isRGBinInt(x) \ + ((x) == AV_PIX_FMT_RGB48BE || \ (x) == AV_PIX_FMT_RGB48LE || \ (x) == AV_PIX_FMT_RGB32 || \ (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_RGBA64LE || \ (x) == AV_PIX_FMT_MONOBLACK || \ - (x) == AV_PIX_FMT_MONOWHITE \ - ) -#define isBGRinInt(x) \ - ( \ - (x) == AV_PIX_FMT_BGR48BE || \ + (x) == AV_PIX_FMT_MONOWHITE) + +#define isBGRinInt(x) \ + ((x) == AV_PIX_FMT_BGR48BE || \ (x) == AV_PIX_FMT_BGR48LE || \ (x) == AV_PIX_FMT_BGR32 || \ (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_BGRA64LE || \ (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) { |