Hi,
patch attached.
From 155ea9e6063553b8f7db83698faf428eaa1f8c04 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Fri, 25 Mar 2016 11:22:39 +0100
Subject: [PATCH] avcodec/jpeg2000dec: account two last bytes from end of
bytestream as EOC marker
This silences missing EOC marker when decoding j2k files with Psot set to 0.
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavcodec/jpeg2000dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index c13670e..962b7bc 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -737,9 +737,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
bytestream2_get_byteu(&s->g); // TNsot
if (!Psot)
- Psot = bytestream2_get_bytes_left(&s->g) + n + 2;
+ Psot = bytestream2_get_bytes_left(&s->g) - 2 + n + 2;
- if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) {
+ if (Psot > bytestream2_get_bytes_left(&s->g) - 2 + n + 2) {
av_log(s->avctx, AV_LOG_ERROR, "Psot %"PRIu32" too big\n", Psot);
return AVERROR_INVALIDDATA;
}
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
