diff options
| author | Andreas Öman <andreas@lonelycoder.com> | 2010-04-14 20:15:19 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2010-04-14 20:15:19 +0000 |
| commit | 4744f896e5290d30539b3531c017d574847cdd59 (patch) | |
| tree | 7894ba7407760280cf49de5252a7dd4a85fa0598 | |
| parent | d21b227818a985ffbda756127af4fcbb0d1a7362 (diff) | |
| download | ffmpeg-4744f896e5290d30539b3531c017d574847cdd59.tar.gz | |
Add PIX_FMT_Y400A, 8bit gray, 8bit alpha
Originally committed as revision 22881 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/imgconvert.c | 1 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 8 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index e6da96ba51..15a7aaaf97 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -602,6 +602,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, case PIX_FMT_BGR4: case PIX_FMT_MONOWHITE: case PIX_FMT_MONOBLACK: + case PIX_FMT_Y400A: picture->data[0] = ptr; picture->data[1] = NULL; picture->data[2] = NULL; diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 6612b9e89d..82b3631e4a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -779,6 +779,14 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { .log2_chroma_h = 1, .flags = PIX_FMT_HWACCEL, }, + [PIX_FMT_Y400A] = { + .name = "y400a", + .nb_components= 2, + .comp = { + {0,1,1,0,7}, /* Y */ + {0,1,2,0,7}, /* A */ + }, + }, }; static enum PixelFormat get_pix_fmt_internal(const char *name) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 9118d3d30f..9ea0ee033c 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -132,6 +132,7 @@ enum PixelFormat { PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1 PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1 + PIX_FMT_Y400A, ///< 8bit gray, 8bit alpha PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; |