[FFmpeg-cvslog] swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

Michael Niedermayer git at videolan.org
Thu Oct 17 14:11:34 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 17 13:39:28 2013 +0200| [d0a3bc13025baab8d48cbcf4c698daf2f0c44adc] | committer: Michael Niedermayer

swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswscale/yuv2rgb.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index c0263cd..77c56a9 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -768,10 +768,10 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
     c->yuv2rgb_u2b_coeff = (int16_t)roundToInt16(cbu << 13);
 
     //scale coefficients by cy
-    crv = ((crv << 16) + 0x8000) / cy;
-    cbu = ((cbu << 16) + 0x8000) / cy;
-    cgu = ((cgu << 16) + 0x8000) / cy;
-    cgv = ((cgv << 16) + 0x8000) / cy;
+    crv = ((crv << 16) + 0x8000) / FFMAX(cy, 1);
+    cbu = ((cbu << 16) + 0x8000) / FFMAX(cy, 1);
+    cgu = ((cgu << 16) + 0x8000) / FFMAX(cy, 1);
+    cgv = ((cgv << 16) + 0x8000) / FFMAX(cy, 1);
 
     av_freep(&c->yuvTable);
 



More information about the ffmpeg-cvslog mailing list