diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:26:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:39:06 +0200 |
| commit | 8e85b69d716b031cf7b01e5a22d79823c8d5aeca (patch) | |
| tree | ee47d321f09f5bcccd46b47005e79f3dce5b42b6 /libavutil/pixdesc.c | |
| parent | 495ed19b5bb0b3facb1833001dce4a4419e82800 (diff) | |
| parent | 8c65264595d5a82c56ae5043320e4b875a414229 (diff) | |
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
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 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 31363cfb61..c17eae50e4 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1660,6 +1660,30 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_h = 1, .flags = PIX_FMT_HWACCEL, }, + [AV_PIX_FMT_XYZ12LE] = { + .name = "xyz12le", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 5, 1, 4, 11 }, /* X */ + { 0, 5, 3, 4, 11 }, /* Y */ + { 0, 5, 5, 4, 11 }, /* Z */ + }, + /*.flags = -- not used*/ + }, + [AV_PIX_FMT_XYZ12BE] = { + .name = "xyz12be", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 5, 1, 4, 11 }, /* X */ + { 0, 5, 3, 4, 11 }, /* Y */ + { 0, 5, 5, 4, 11 }, /* Z */ + }, + .flags = PIX_FMT_BE, + }, }; static enum AVPixelFormat get_pix_fmt_internal(const char *name) |