* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6': avutil: add AV_PIX_FMT_YA16 pixel format Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h
Unified · Split
| @@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines | |||
| 15 | 15 | ||
| 16 | API changes, most recent first: | 16 | API changes, most recent first: |
| 17 | 17 | ||
| 18 | 2014-08-xx - xxxxxxx - lavu 53.22.0 - pixfmt.h | ||
| 19 | Add AV_PIX_FMT_YA16 pixel format for 16 bit packed gray with alpha. | ||
| 20 | |||
| 18 | 2014-08-xx - xxxxxxx - lavu 53.21.1 - avstring.h | 21 | 2014-08-xx - xxxxxxx - lavu 53.21.1 - avstring.h |
| 19 | Rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 to better identify the format. | 22 | Rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 to better identify the format. |
| 20 | An alias pixel format and color space name are provided for compatibility. | 23 | An alias pixel format and color space name are provided for compatibility. |
| @@ -1560,6 +1560,24 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1559 unmodified lines | |||
| 1560 | .flags = AV_PIX_FMT_FLAG_ALPHA, | 1560 | .flags = AV_PIX_FMT_FLAG_ALPHA, |
| 1561 | .alias = "gray8a", | 1561 | .alias = "gray8a", |
| 1562 | }, | 1562 | }, |
| 1563 | [AV_PIX_FMT_YA16LE] = { | ||
| 1564 | .name = "ya16le", | ||
| 1565 | .nb_components = 2, | ||
| 1566 | .comp = { | ||
| 1567 | { 0, 3, 1, 0, 15 }, /* Y */ | ||
| 1568 | { 0, 3, 3, 0, 15 }, /* A */ | ||
| 1569 | }, | ||
| 1570 | .flags = AV_PIX_FMT_FLAG_ALPHA, | ||
| 1571 | }, | ||
| 1572 | [AV_PIX_FMT_YA16BE] = { | ||
| 1573 | .name = "ya16be", | ||
| 1574 | .nb_components = 2, | ||
| 1575 | .comp = { | ||
| 1576 | { 0, 3, 1, 0, 15 }, /* Y */ | ||
| 1577 | { 0, 3, 3, 0, 15 }, /* A */ | ||
| 1578 | }, | ||
| 1579 | .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA, | ||
| 1580 | }, | ||
| 1563 | [AV_PIX_FMT_GBRP] = { | 1581 | [AV_PIX_FMT_GBRP] = { |
| 1564 | .name = "gbrp", | 1582 | .name = "gbrp", |
| 1565 | .nb_components = 3, | 1583 | .nb_components = 3, |
| @@ -236,6 +236,10 @@ enum AVPixelFormat { · 235 unmodified lines | |||
| 236 | 236 | ||
| 237 | AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef | 237 | AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef |
| 238 | 238 | ||
| 239 | AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) | ||
| 240 | AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) | ||
| 241 | |||
| 242 | |||
| 239 | #ifndef AV_PIX_FMT_ABI_GIT_MASTER | 243 | #ifndef AV_PIX_FMT_ABI_GIT_MASTER |
| 240 | 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 | 244 | 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 |
| 241 | 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 | 245 | 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 { · 78 unmodified lines | |||
| 320 | #define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0) | 324 | #define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0) |
| 321 | 325 | ||
| 322 | #define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE) | 326 | #define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE) |
| 327 | #define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE) | ||
| 323 | #define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE) | 328 | #define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE) |
| 324 | #define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE) | 329 | #define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE) |
| 325 | #define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE) | 330 | #define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE) |
| @@ -56,8 +56,8 @@ · 55 unmodified lines | |||
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #define LIBAVUTIL_VERSION_MAJOR 52 | 58 | #define LIBAVUTIL_VERSION_MAJOR 52 |
| 59 | #define LIBAVUTIL_VERSION_MINOR 96 | 59 | #define LIBAVUTIL_VERSION_MINOR 97 |
| 60 | #define LIBAVUTIL_VERSION_MICRO 101 | 60 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 61 | 61 | ||
| 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| 63 | LIBAVUTIL_VERSION_MINOR, \ | 63 | LIBAVUTIL_VERSION_MINOR, \ |