Commit 89f8bff7 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/hevcdec: Do not check the first ff_init_cabac_decoder() call in...

avcodec/hevcdec: Do not check the first ff_init_cabac_decoder() call in hls_decode_entry_wpp() for failure

The result of the call is not used in any testcase but breaks some cases if
its failure is considered.

Fixes regression found by jamrial
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 73ea2a02
...@@ -2421,10 +2421,7 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int ...@@ -2421,10 +2421,7 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int
ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]); ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]);
if (ret < 0) if (ret < 0)
goto error; goto error;
ff_init_cabac_decoder(&lc->cc, s->data + s->sh.offset[(ctb_row)-1], s->sh.size[ctb_row - 1]);
ret = ff_init_cabac_decoder(&lc->cc, s->data + s->sh.offset[(ctb_row)-1], s->sh.size[ctb_row - 1]);
if (ret < 0)
goto error;
} }
while(more_data && ctb_addr_ts < s->ps.sps->ctb_size) { while(more_data && ctb_addr_ts < s->ps.sps->ctb_size) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment