diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-22 03:31:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-26 21:52:47 +0100 |
| commit | bd79dbfa2b8f3c9c183c39dc35cada90500dac97 (patch) | |
| tree | 3b2a3b5380e371a2abd09bb463f61941e30118b3 /libavutil | |
| parent | c4765a41b956f15b855746a8fe91309e087431f4 (diff) | |
| download | android_external_ffmpeg-bd79dbfa2b8f3c9c183c39dc35cada90500dac97.tar.gz android_external_ffmpeg-bd79dbfa2b8f3c9c183c39dc35cada90500dac97.tar.bz2 android_external_ffmpeg-bd79dbfa2b8f3c9c183c39dc35cada90500dac97.zip | |
avutil/pixdesc: Make get_color_type() aware of CIE XYZ formats
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1ec7a703806049265991723a8826bd61555edef4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 58833cfb8e..dd7de7ee25 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2275,6 +2275,7 @@ enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt) #define FF_COLOR_GRAY 1 /**< gray color space */ #define FF_COLOR_YUV 2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */ #define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */ +#define FF_COLOR_XYZ 4 #define pixdesc_has_alpha(pixdesc) \ ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & AV_PIX_FMT_FLAG_PAL) @@ -2290,6 +2291,9 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { if(desc->name && !strncmp(desc->name, "yuvj", 4)) return FF_COLOR_YUV_JPEG; + if(desc->name && !strncmp(desc->name, "xyz", 3)) + return FF_COLOR_XYZ; + if(desc->flags & AV_PIX_FMT_FLAG_RGB) return FF_COLOR_RGB; |