diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 14:35:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 14:43:09 +0200 |
| commit | c2ac389bba2481d18b59055c0a929e57b241c055 (patch) | |
| tree | 3b633386fe20296f401b7c636e4336911b9878a5 /libavcodec/jpeg2000.c | |
| parent | 09e03a84674f9b86415f47f09494a5730aae2a5f (diff) | |
| download | ffmpeg-c2ac389bba2481d18b59055c0a929e57b241c055.tar.gz | |
jpeg2000: remove unneeded casts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 1610a210cd..9339523e88 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -279,7 +279,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, /*TODO: Compute formula to implement. */ numbps = cbps + lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)]; - band->f_stepsize = (float)SHL(2048 + qntsty->mant[gbandno], + band->f_stepsize = SHL(2048 + qntsty->mant[gbandno], 2 + numbps - qntsty->expn[gbandno]); break; case JPEG2000_QSTY_SE: @@ -293,7 +293,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, * Further investigation needed. */ gain = cbps; band->f_stepsize = pow(2.0, gain - qntsty->expn[gbandno]); - band->f_stepsize *= (float)qntsty->mant[gbandno] / 2048.0 + 1.0; + band->f_stepsize *= qntsty->mant[gbandno] / 2048.0 + 1.0; break; default: band->f_stepsize = 0; @@ -305,7 +305,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, if (!av_codec_is_encoder(avctx->codec)) band->f_stepsize *= 0.5; - band->i_stepsize = (int32_t)(band->f_stepsize * (1 << 16)); + band->i_stepsize = band->f_stepsize * (1 << 16); /* computation of tbx_0, tbx_1, tby_0, tby_1 * see ISO/IEC 15444-1:2002 B.5 eq. B-15 and tbl B.1 |