diff options
| author | Michael Niedermayer | 2015-04-07 02:47:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2015-04-07 02:47:36 +0200 |
| commit | c4b2017ba66e1623da9f527704c61c86a6e74844 (patch) | |
| tree | 6f53206884d68925b436ee5b8ef11c25e9db554e /libavcodec | |
| parent | 43b434210e597d484aef57c4139c3126d22b7e2b (diff) | |
avcodec/h264: finish previous slices before switching to single thread mode
Fixes null pointer dereference
Fixes Ticket4438
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5dd187d2b5..b4c4cd96c9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1674,6 +1674,12 @@ again: av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0; } else if (err == SLICE_SINGLETHREAD) { + if (context_count > 1) { + ret = ff_h264_execute_decode_slices(h, context_count - 1); + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) + goto end; + context_count = 0; + } /* Slice could not be decoded in parallel mode, restart. Note * that rbsp_buffer is not transferred, but since we no longer * run in parallel mode this should not be an issue. */ |