Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58': jpeg2000: Check zero bit-plane validity Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 2cad1ea29e
parent db5c93a1a9 17e5d614a8
commit 2cad1ea29e
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@ -659,10 +659,10 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,

            if (!cblk->npasses) {
                int v = expn[bandno] + numgbits - 1 -
-                                    tag_tree_decode(s, prec->zerobits + cblkno,
-                                                    100);
+                        tag_tree_decode(s, prec->zerobits + cblkno, 100);
                if (v < 0) {
-                    av_log(s->avctx, AV_LOG_ERROR, "nonzerobits %d invalid\n", v);
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "nonzerobits %d invalid\n", v);
                    return AVERROR_INVALIDDATA;
                }
                cblk->nonzerobits = v;