avcodec/diracdec: Factor quant matrix reads

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago · 6d6fc4105b
parent d98f34d7d4
commit 6d6fc4105b
1 changed files with 3 additions and 4 deletions
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@ -1257,11 +1257,10 @@ static int dirac_unpack_idwt_params(DiracContext *s)
        if (get_bits1(gb)) {
            av_log(s->avctx,AV_LOG_DEBUG,"Low Delay: Has Custom Quantization Matrix!\n");
            /* custom quantization matrix */
-            s->lowdelay.quant[0][0] = get_interleaved_ue_golomb(gb);
            for (level = 0; level < s->wavelet_depth; level++) {
-                s->lowdelay.quant[level][1] = get_interleaved_ue_golomb(gb);
-                s->lowdelay.quant[level][2] = get_interleaved_ue_golomb(gb);
-                s->lowdelay.quant[level][3] = get_interleaved_ue_golomb(gb);
+                for (i = !!level; i < 4; i++) {
+                    s->lowdelay.quant[level][i] = get_interleaved_ue_golomb(gb);
+                }
            }
        } else {
            if (s->wavelet_depth > 4) {