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>
12 years ago · 9dfa5ea5dc
parent a4a16821d7 86a2602e16
commit 9dfa5ea5dc
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@ -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++) {