From b61d3dfab0d75daf81f366c12c57539c90e9b38b Mon Sep 17 00:00:00 2001 From: Gautam Ramakrishnan Date: Tue, 21 Jul 2020 23:37:14 +0530 Subject: [PATCH] libavcodec/jpeg2000dec: Add check when done with main header markers This patch sets a flag when the processing of the main header is complete. Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index f5ad8402fb..e941ebb5d0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -102,6 +102,7 @@ typedef struct Jpeg2000DecoderContext { uint8_t cbps[4]; // bits per sample in particular components uint8_t sgnd[4]; // if a component is signed uint8_t properties[4]; + uint8_t in_tile_headers; int cdx[4], cdy[4]; int precision; int ncomponents; @@ -2165,6 +2166,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_poc(s, len, poc); break; case JPEG2000_SOT: + if (!s->in_tile_headers) { + s->in_tile_headers = 1; + } if (!(ret = get_sot(s, len))) { av_assert1(s->curtileno >= 0); codsty = s->tile[s->curtileno].codsty;