highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavcodec/jpeg2000dec: Add check when done with main header markers

Browse Source 
This patch sets a flag when the processing of the
main header is complete.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Gautam Ramakrishnan
2020-07-21 23:37:14 +05:30
committed by Michael Niedermayer
parent 5eb4405fc5
commit b61d3dfab0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000dec.c
View File

@ -102,6 +102,7 @@ typedef struct Jpeg2000DecoderContext {
uint8_t cbps[4]; // bits per sample in particular components uint8_t cbps[4]; // bits per sample in particular components
uint8_t sgnd[4]; // if a component is signed uint8_t sgnd[4]; // if a component is signed
uint8_t properties[4]; uint8_t properties[4];
uint8_t in_tile_headers;
int cdx[4], cdy[4]; int cdx[4], cdy[4];
int precision; int precision;
int ncomponents; int ncomponents;
@ -2165,6 +2166,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
ret = get_poc(s, len, poc); ret = get_poc(s, len, poc);
break; break;
case JPEG2000_SOT: case JPEG2000_SOT:
if (!s->in_tile_headers) {
s->in_tile_headers = 1;
}
if (!(ret = get_sot(s, len))) { if (!(ret = get_sot(s, len))) {
av_assert1(s->curtileno >= 0); av_assert1(s->curtileno >= 0);
codsty = s->tile[s->curtileno].codsty; codsty = s->tile[s->curtileno].codsty;