diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 02:32:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 02:32:45 +0200 |
| commit | a58f1bcc4cbe41747ed88f6abc0b01932ba238a9 (patch) | |
| tree | e00c933778deab560b3d0513a45668c253b86698 /libavcodec/jpeg2000dec.c | |
| parent | 4bfdd967a6b2908c9562f9a0ec731e5745cfa796 (diff) | |
avcodec/jpeg2000dec: Skip SOP
Fixes Ticket4625
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index a4f5c8c23c..d5abc42399 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -812,6 +812,9 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, } } + if (bytestream2_peek_be32(&s->g) == 0xFF910004) + bytestream2_skip(&s->g, 6); + if (!(ret = get_bits(s, 1))) { jpeg2000_flush(s); return 0; |