Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)
* commit '5bf208f659703895df7926238dcfa8a8175de36b':
  jpeg2000: Use separate fields for int and float codepaths
  jpeg2000: Split int/float codepaths depending on the DWT

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

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

index 37d7a65..85216f5 100644 (file)
@@ -295,7 +295,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
                 numbps = cbps +
                          lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)];
                 band->f_stepsize = SHL(2048 + qntsty->mant[gbandno],
-                                            2 + numbps - qntsty->expn[gbandno]);
+                                       2 + numbps - qntsty->expn[gbandno]);
                 break;
             case JPEG2000_QSTY_SE:
                 /* Exponent quantization step.