diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:12:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:12:24 +0200 |
| commit | 6017c98036078283ce3bf4069227fed13f3e0cc0 (patch) | |
| tree | 3e11afe65808350d60e0aaca070d4b7bff8f45fc /libavutil/pixfmt.h | |
| parent | 4c8bc6fdee95af4cd7a8409dec34756350078b5e (diff) | |
| parent | e9abafca278f87e1ecc6d50091d99b73ff63c9a6 (diff) | |
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
avutil: add AV_PIX_FMT_YA16 pixel format
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6e4568133e..a76a852cda 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -236,6 +236,10 @@ enum AVPixelFormat { AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef + AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) + AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) + + #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian @@ -320,6 +324,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0) #define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE) +#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE) #define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE) #define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE) #define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE) |