diracdec: remove duplicate codeblock decoding
authorRostislav Pehlivanov <atomnuker@gmail.com>
Thu, 10 Dec 2015 22:50:58 +0000 (22:50 +0000)
committerRostislav Pehlivanov <atomnuker@gmail.com>
Thu, 10 Dec 2015 22:50:58 +0000 (22:50 +0000)
Broken by commit 7424a6d0a589d31100d6067ebcb47236c00f4b36

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
libavcodec/diracdec.c

index 6e5fe9f..679ec6a 100644 (file)
@@ -1127,19 +1127,6 @@ static int dirac_unpack_idwt_params(DiracContext *s)
                 }
         }
     }
-    /* Codeblock parameters (core syntax only) */
-    if (s->core_syntax) {
-        if (get_bits1(gb)) {
-            for (i = 0; i <= s->wavelet_depth; i++) {
-                CHECKEDREAD(s->codeblock[i].width , tmp < 1 || tmp > (s->avctx->width >>s->wavelet_depth-i), "codeblock width invalid\n")
-                CHECKEDREAD(s->codeblock[i].height, tmp < 1 || tmp > (s->avctx->height>>s->wavelet_depth-i), "codeblock height invalid\n")
-            }
-            CHECKEDREAD(s->codeblock_mode, tmp > 1, "unknown codeblock mode\n")
-        } else {
-            for (i = 0; i <= s->wavelet_depth; i++)
-                s->codeblock[i].width = s->codeblock[i].height = 1;
-        }
-    }
     return 0;
 }