summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-16 20:00:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-16 20:16:53 +0200
commit8294ec67b5b18c44d2406c77b6f6cd09201055c7 (patch)
tree0cf7efaebd42aaab4b8af35d8fa2efb3279486f7
parent20657e05bc2608dae03e7e8d47da11c2cdcaed38 (diff)
downloadffmpeg-streaming-8294ec67b5b18c44d2406c77b6f6cd09201055c7.zip
ffmpeg-streaming-8294ec67b5b18c44d2406c77b6f6cd09201055c7.tar.gz
avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode
Fixes Ticket4630 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/jpeg2000dwt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index ceceda3..a5eb0b7 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);
OpenPOWER on IntegriCloud