From 9841024402e83e0d239edf4f356d97e0519aaf4d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 17 Jun 2015 14:45:15 +0200 Subject: avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode Fixes Ticket4634 Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dwt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/jpeg2000dwt.c') diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index 225b08f3ef..511f223718 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -365,6 +365,8 @@ static void sr_1d97_float(float *p, int i0, int i1) if (i1 <= i0 + 1) { if (i0 == 1) p[1] *= F_LFTG_K/2; + else + p[0] *= F_LFTG_X/2; return; } @@ -440,6 +442,8 @@ static void sr_1d97_int(int32_t *p, int i0, int i1) if (i1 <= i0 + 1) { if (i0 == 1) p[1] = (p[1] * I_LFTG_K + (1<<16)) >> 17; + else + p[0] = (p[0] * I_LFTG_X + (1<<16)) >> 17; return; } -- cgit v1.2.3