[FFmpeg-cvslog] avformat/vf_vapoursynth: simplify xyz format check

Niklas Haas git at videolan.org
Tue Oct 31 16:50:26 EET 2023


ffmpeg | branch: master | Niklas Haas <git at haasn.dev> | Thu Oct 26 13:55:17 2023 +0200| [6aff17a4511189a6765d7874a581d57dede26f01] | committer: Niklas Haas

avformat/vf_vapoursynth: simplify xyz format check

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aff17a4511189a6765d7874a581d57dede26f01
---

 libavformat/vapoursynth.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/vapoursynth.c b/libavformat/vapoursynth.c
index 965d36dc2e..b79ecfcf1b 100644
--- a/libavformat/vapoursynth.c
+++ b/libavformat/vapoursynth.c
@@ -118,7 +118,8 @@ static av_cold enum AVPixelFormat match_pixfmt(const VSFormat *vsf, int c_order[
         pixfmt = av_pix_fmt_desc_get_id(pd);
 
         if (pd->flags & (AV_PIX_FMT_FLAG_BAYER | AV_PIX_FMT_FLAG_ALPHA |
-                         AV_PIX_FMT_FLAG_HWACCEL | AV_PIX_FMT_FLAG_BITSTREAM))
+                         AV_PIX_FMT_FLAG_HWACCEL | AV_PIX_FMT_FLAG_BITSTREAM |
+                         AV_PIX_FMT_FLAG_XYZ))
             continue;
 
         if (pd->log2_chroma_w != vsf->subSamplingW ||
@@ -141,9 +142,6 @@ static av_cold enum AVPixelFormat match_pixfmt(const VSFormat *vsf, int c_order[
         if (av_pix_fmt_count_planes(pixfmt) != vsf->numPlanes)
             continue;
 
-        if (strncmp(pd->name, "xyz", 3) == 0)
-            continue;
-
         if (!is_native_endian(pixfmt))
             continue;
 



More information about the ffmpeg-cvslog mailing list