ffmpeg | branch: master | Rostislav Pehlivanov <atomnu...@gmail.com> | Thu Dec 10 22:50:58 2015 +0000| [d8f13e783a55ff140f5f3e9729aeb83174d7183d] | committer: Rostislav Pehlivanov
diracdec: remove duplicate codeblock decoding Broken by commit 7424a6d0a589d31100d6067ebcb47236c00f4b36 Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8f13e783a55ff140f5f3e9729aeb83174d7183d --- libavcodec/diracdec.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 6e5fe9f..679ec6a 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
