summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-06-30 07:05:52 -0700
committerMichael Niedermayer <michaelni@gmx.at>2011-07-01 03:07:37 +0200
commitafb9d4e8f10a78d52750e59bfd06d6fbd88e98f3 (patch)
treedc2a5ccb6baeafdaf1f9d506e91c76a6f71f4b92 /libswscale
parentebb0d6035394eaeddc346173e7c0a314fe568fd9 (diff)
swscale: fix another yuv range conversion overflow in 16bit scaling.
(cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 644f84858c..06ce8ff417 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2001,7 +2001,7 @@ static void lumRangeToJpeg16_c(int16_t *_dst, int width)
int i;
int32_t *dst = (int32_t *) _dst;
for (i = 0; i < width; i++)
- dst[i] = (FFMIN(dst[i],30189<<4)*19077 - (39057361<<4))>>14;
+ dst[i] = (FFMIN(dst[i],30189<<4)*4769 - (39057361<<2))>>12;
}
static void lumRangeFromJpeg16_c(int16_t *_dst, int width)
{