diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-25 04:25:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-25 04:25:56 +0200 |
| commit | 89f8bff7983f375e3f0638c0af8d12520a478808 (patch) | |
| tree | 7f0e7d0e4df2878dc7dca98f7e4e0d5f1a910e62 | |
| parent | 73ea2a028e12a7d779834f78dc496c8c4b08361f (diff) | |
| download | ffmpeg-89f8bff7983f375e3f0638c0af8d12520a478808.tar.gz | |
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: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/hevcdec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f4114fd993..0f1469fc0f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -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]); if (ret < 0) goto error; - - 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; + ff_init_cabac_decoder(&lc->cc, s->data + s->sh.offset[(ctb_row)-1], s->sh.size[ctb_row - 1]); } while(more_data && ctb_addr_ts < s->ps.sps->ctb_size) { |