[FFmpeg-cvslog] libswscale/utils: Fix bayer to yuvj

Michael Niedermayer git at videolan.org
Sun Apr 14 21:33:06 EEST 2024


ffmpeg | branch: release/4.4 | Michael Niedermayer <michael at niedermayer.cc> | Tue Feb 20 03:32:38 2024 +0100| [ba195645bc7421656583c1b330b61832f52d7ceb] | committer: Michael Niedermayer

libswscale/utils: Fix bayer to yuvj

Fixes: out of array access.

Earlier code assumes that a unscaled bayer to yuvj420 converter exists
but the later code then skips yuvj420

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit e9cc9e492f987ce23ce8c514258a17952dd20401)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libswscale/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index a408579050..b93a185af7 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1840,7 +1840,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
     /* unscaled special cases */
     if (unscaled && !usesHFilter && !usesVFilter &&
         (c->srcRange == c->dstRange || isAnyRGB(dstFormat) ||
-         isFloat(srcFormat) || isFloat(dstFormat))){
+         isFloat(srcFormat) || isFloat(dstFormat) || isBayer(srcFormat))){
         ff_get_unscaled_swscale(c);
 
         if (c->swscale) {



More information about the ffmpeg-cvslog mailing list