Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)
* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
  jpeg2000: Use the correct sizeof in memset for T1 data
  jpeg2000: Simplify init_tile()
  jpeg2000: Update pixel format support

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jpeg2000dec.c

@@@ -939,19 -945,17 +939,19 @@@ static int decode_cblk(Jpeg2000DecoderC
      /* If code-block contains no compressed data: nothing to do. */
      if (!cblk->length)
          return 0;
-     for (y = 0; y < height+2; y++)
-         memset(t1->flags[y], 0, (width + 2)*sizeof(**t1->flags));
 +
+     for (y = 0; y < height + 2; y++)
+         memset(t1->flags[y], 0, (width + 2) * sizeof(**t1->flags));
  
 +    cblk->data[cblk->length] = 0xff;
 +    cblk->data[cblk->length+1] = 0xff;
      ff_mqc_initdec(&t1->mqc, cblk->data);
 -    cblk->data[cblk->length]     = 0xff;
 -    cblk->data[cblk->length + 1] = 0xff;
  
      while (passno--) {
 -        switch (pass_t) {
 +        switch(pass_t) {
          case 0:
 -            decode_sigpass(t1, width, height, bpno + 1, bandpos);
 +            decode_sigpass(t1, width, height, bpno + 1, bandpos,
 +                           bpass_csty_symbol && (clnpass_cnt >= 4), vert_causal_ctx_csty_symbol);
              break;
          case 1:
              decode_refpass(t1, width, height, bpno + 1);