diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:26:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:32:13 +0200 |
| commit | 2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5 (patch) | |
| tree | 43caa8bdcf7a5d885b81a37755ded859ec7cad17 /libswscale/swscale_internal.h | |
| parent | 6017c98036078283ce3bf4069227fed13f3e0cc0 (diff) | |
| parent | f84a1b597c29dc035b8d5529ef88c2d7ff057820 (diff) | |
| download | ffmpeg-2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5.tar.gz | |
Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'
* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
swscale: support AV_PIX_FMT_YA16 as input
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index cf7b955bac..5caf2ae6a8 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -672,7 +672,9 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) ((x) == AV_PIX_FMT_GRAY8 || \ (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ - (x) == AV_PIX_FMT_GRAY16LE) + (x) == AV_PIX_FMT_GRAY16LE || \ + (x) == AV_PIX_FMT_YA16BE || \ + (x) == AV_PIX_FMT_YA16LE) #endif #define isRGBinInt(x) \ |