diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:30:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:30:05 +0200 |
| commit | 2328e7e865216acdad6c9ce8a8dae4664aff3a29 (patch) | |
| tree | b36393eb4db949bbda12bbee44e093d2fdbc73ad | |
| parent | 11cf4b72475f70a35d78b04e3b21d295c2da8a1d (diff) | |
| parent | 5bf208f659703895df7926238dcfa8a8175de36b (diff) | |
| download | ffmpeg-2328e7e865216acdad6c9ce8a8dae4664aff3a29.tar.gz | |
Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
* 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>
| -rw-r--r-- | libavcodec/jpeg2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 37d7a653db..85216f5f47 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -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. |