From 8294ec67b5b18c44d2406c77b6f6cd09201055c7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 16 Jun 2015 20:00:39 +0200 Subject: [PATCH] avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode Fixes Ticket4630 Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dwt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index ceceda36dc..a5eb0b77fc 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -290,8 +290,11 @@ static void sr_1d53(int *p, int i0, int i1) { int i; - if (i1 == i0 + 1) + if (i1 <= i0 + 1) { + if (i0 == 1) + p[1] >>= 1; return; + } extend53(p, i0, i1);