diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:23:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:24:01 +0100 |
| commit | ada0fc4efa2502c901310faef6b63349e8b6bd6a (patch) | |
| tree | 491f57008a078c48f13071e71d51e9a0db6c111b | |
| parent | 55dc253c24f2160ede1db4f04cfe0692b0b80d05 (diff) | |
| parent | 0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a (diff) | |
| download | ffmpeg-ada0fc4efa2502c901310faef6b63349e8b6bd6a.tar.gz | |
Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'
* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
lavu: add planar 16 bit and 8 bit rgb with alpha
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See: e6d4e687558d08187e7a415a7725e4b1a416f782
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/pixfmt.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 756a1a7c1a..d82051ac45 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -239,6 +239,10 @@ enum AVPixelFormat { AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) + AV_PIX_FMT_GBRAP_LIBAV, ///< planar GBRA 4:4:4:4 32bpp + AV_PIX_FMT_GBRAP16BE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, big-endian + AV_PIX_FMT_GBRAP16LE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, 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 diff --git a/libavutil/version.h b/libavutil/version.h index 5fd331c489..8be61e356f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 16 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |