diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:31:40 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:31:40 +0200 |
| commit | 5a754f92d1abbbbf1dede3502f7f0c1d1838b98a (patch) | |
| tree | f351c893739702c7112e2e94162d00475082bc19 /libavcodec | |
| parent | 5de28d341f242c6892e4c13d6274100815a5882d (diff) | |
| parent | 41bcc3d15204f290400ba02e4e8f87fc07bcc00e (diff) | |
| download | ffmpeg-5a754f92d1abbbbf1dede3502f7f0c1d1838b98a.tar.gz | |
Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'
* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
jpeg2000: Split codeblock decoding from the main tile decoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -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 68c0a17866..81e8a055e7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1650,7 +1650,9 @@ static void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) Jpeg2000Prec *prec = band->prec + precno; /* Loop on codeblocks */ - for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { + for (cblkno = 0; + cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; + cblkno++) { int x, y; Jpeg2000Cblk *cblk = prec->cblk + cblkno; decode_cblk(s, codsty, &t1, cblk, |