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/pixdesc.c | |
| 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/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 5deafb5115..154392af20 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1560,6 +1560,24 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .flags = AV_PIX_FMT_FLAG_ALPHA, .alias = "gray8a", }, + [AV_PIX_FMT_YA16LE] = { + .name = "ya16le", + .nb_components = 2, + .comp = { + { 0, 3, 1, 0, 15 }, /* Y */ + { 0, 3, 3, 0, 15 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_YA16BE] = { + .name = "ya16be", + .nb_components = 2, + .comp = { + { 0, 3, 1, 0, 15 }, /* Y */ + { 0, 3, 3, 0, 15 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA, + }, [AV_PIX_FMT_GBRP] = { .name = "gbrp", .nb_components = 3, |