diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 11:48:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 11:48:42 +0200 |
| commit | 8672c0a6436c9fc9d107617cf28cafe09ad3d9a5 (patch) | |
| tree | 89de9d6b34061a928a34381598fa29d2392b7def /libavcodec/jpeg2000dec.c | |
| parent | aab4dbe534e2272fc18e978d921ab696cb067407 (diff) | |
| download | ffmpeg-8672c0a6436c9fc9d107617cf28cafe09ad3d9a5.tar.gz | |
avcodec/jpeg2000dec: Limit poc end fields to whats available in jpeg2000_decode_packets()
Fixes: Ticket4677
Solution based on information from
https://code.google.com/p/openjpeg/issues/detail?id=80
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index fdacf57929..68dd4c0ecc 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1309,7 +1309,9 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile Jpeg2000POCEntry *e = &tile->poc.poc[i]; ret = jpeg2000_decode_packets_po_iteration(s, tile, e->RSpoc, e->CSpoc, - e->LYEpoc, e->REpoc, e->CEpoc, + FFMIN(e->LYEpoc, tile->codsty[0].nlayers), + e->REpoc, + FFMIN(e->CEpoc, s->ncomponents), e->Ppoc, &tp_index ); if (ret < 0) |