Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'

[ffmpeg] / libavcodec / jpeg2000.c

diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index b60e7709873b5decceeb3a9df53baf00ccc32448..683728e374bbc41edeed81017e05fd8e333750b6 100644 (file)
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -330,13 +330,14 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
                     band->f_stepsize *= pow(F_LFTG_K, 2*(codsty->nreslevels2decode - reslevelno) + lband - 2);
                 }
             }
+
+            band->i_stepsize = band->f_stepsize * (1 << 15);
+
             /* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
              * If not set output of entropic decoder is not correct. */
             if (!av_codec_is_encoder(avctx->codec))
                 band->f_stepsize *= 0.5;
 
-            band->i_stepsize = band->f_stepsize * (1 << 15);
-
             /* 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
              * codeblock width and height is computed for