Browse Source

lavc/jpeg2000dec: Support reading 64-bit atom size.

Fixes ticket #6935.
tags/n4.0
Carl Eugen Hoyos 8 years ago
parent
commit
658bdc6771
1 changed files with 10 additions and 1 deletions
  1. +10
    -1
      libavcodec/jpeg2000dec.c

+ 10
- 1
libavcodec/jpeg2000dec.c View File

@@ -2009,7 +2009,16 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
bytestream2_get_bytes_left(&s->g) >= 8) {
atom_size = bytestream2_get_be32u(&s->g);
atom = bytestream2_get_be32u(&s->g);
atom_end = bytestream2_tell(&s->g) + atom_size - 8;
if (atom_size == 1) {
if (bytestream2_get_be32u(&s->g)) {
avpriv_request_sample(s->avctx, "Huge atom");
return 0;
}
atom_size = bytestream2_get_be32u(&s->g);
atom_end = bytestream2_tell(&s->g) + atom_size - 16;
} else {
atom_end = bytestream2_tell(&s->g) + atom_size - 8;
}

if (atom == JP2_CODESTREAM)
return 1;


Loading…
Cancel
Save