summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2015-12-10 22:50:58 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2015-12-10 22:50:58 +0000
commitd8f13e783a55ff140f5f3e9729aeb83174d7183d (patch)
tree34e549e99ab1f2ac46f031637b311cf15f0a7fd4
parent3652dd5d0ceef6281d86fbd68aa7b5552f59bb1f (diff)
diracdec: remove duplicate codeblock decoding
Broken by commit 7424a6d0a589d31100d6067ebcb47236c00f4b36 Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
-rw-r--r--libavcodec/diracdec.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 6e5fe9f45e..679ec6a4b1 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -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;
}