Skip to content

F
ffmpeg.wasm-core
Commit 27c1eae5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/h264: Fix off by 1 context count 

Fixes fate-h264-xavc-4389 with slice threads
parent c206a324
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavcodec/h264.c
View file @ 27c1eae5
...@@ -1270,12 +1270,10 @@ again: ...@@ -1270,12 +1270,10 @@ again:
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0; sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0;
} else if (err == SLICE_SINGLETHREAD) { } else if (err == SLICE_SINGLETHREAD) {
if (context_count > 1) { ret = ff_h264_execute_decode_slices(h, context_count);
ret = ff_h264_execute_decode_slices(h, context_count - 1); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) goto end;
goto end; context_count = 0;
context_count = 0;
}
/* Slice could not be decoded in parallel mode, restart. Note /* Slice could not be decoded in parallel mode, restart. Note
* that rbsp_buffer is not transferred, but since we no longer * that rbsp_buffer is not transferred, but since we no longer
* run in parallel mode this should not be an issue. */ * run in parallel mode this should not be an issue. */
......
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