Browse Source

avcodec/jpeg2000dec: Replace TPsot check by assert

The condition is impossible now.
the TPsot type is changed to unsigned int to prevent gcc from producing warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
bb9f4f94ac
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      libavcodec/jpeg2000dec.c

+ 2
- 5
libavcodec/jpeg2000dec.c View File

@@ -627,7 +627,7 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
Jpeg2000TilePart *tp;
uint16_t Isot;
uint32_t Psot;
uint8_t TPsot;
unsigned TPsot;

if (bytestream2_get_bytes_left(&s->g) < 8)
return AVERROR_INVALIDDATA;
@@ -652,10 +652,7 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
return AVERROR_INVALIDDATA;
}

if (TPsot >= FF_ARRAY_ELEMS(s->tile[Isot].tile_part)) {
avpriv_request_sample(s->avctx, "Support for %"PRIu8" components", TPsot);
return AVERROR_PATCHWELCOME;
}
av_assert0(TPsot < FF_ARRAY_ELEMS(s->tile[Isot].tile_part));

s->tile[Isot].tp_idx = TPsot;
tp = s->tile[Isot].tile_part + TPsot;


Loading…
Cancel
Save