diff mbox series

[FFmpeg-devel,4/5] avutil/pixdesc: simplify xyz pixfmt check

Message ID 20231026121901.68926-4-ffmpeg@haasn.xyz
State New
Headers show
Series [FFmpeg-devel,1/5] avfilter/drawutils: ban XYZ formats | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Niklas Haas Oct. 26, 2023, 12:19 p.m. UTC 
From: Niklas Haas <git@haasn.dev>

---
 libavutil/pixdesc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index f2647d3d55..4e4a63e287 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -3055,13 +3055,13 @@  static int get_color_type(const AVPixFmtDescriptor *desc) {
     if (desc->name) {
         if (av_strstart(desc->name, "yuvj", NULL))
             return FF_COLOR_YUV_JPEG;
-
-        if (av_strstart(desc->name, "xyz", NULL))
-            return FF_COLOR_XYZ;
     }
 
     if(desc->flags & AV_PIX_FMT_FLAG_RGB)
-        return  FF_COLOR_RGB;
+        return FF_COLOR_RGB;
+
+    if(desc->flags & AV_PIX_FMT_FLAG_XYZ)
+        return FF_COLOR_XYZ;
 
     if(desc->nb_components == 0)
         return FF_COLOR_NA;