mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
* commit '86a2602e16171ddc10c3ec655c23b16ffa595059': jpeg2000: Drop unused and writeonly fields jpeg2000: Correctly calculate sgnd Conflicts: libavcodec/jpeg2000.h libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9dfa5ea5dc
@ -646,7 +646,6 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
|
||||
if (band->coord[0][0] == band->coord[0][1] ||
|
||||
band->coord[1][0] == band->coord[1][1])
|
||||
continue;
|
||||
|
||||
nb_code_blocks = prec->nb_codeblocks_height *
|
||||
prec->nb_codeblocks_width;
|
||||
for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {
|
||||
|
Loading…
Reference in New Issue
Block a user