diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 02:47:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 22:01:46 +0200 |
| commit | 3550d239a6cb2eb8ae2ecb1dc80247ef2f549601 (patch) | |
| tree | f19b3fcdd0dd9a2d0bc91da66b5eeec012d86847 | |
| parent | d3f96c1e3cc291d32616a2ab25d16a44d2170a36 (diff) | |
| download | ffmpeg-3550d239a6cb2eb8ae2ecb1dc80247ef2f549601.tar.gz | |
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>
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
| -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 e64cc0780a..6fa0b7b8c6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1680,6 +1680,12 @@ again: av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); h->ref_count[0] = h->ref_count[1] = h->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, copy down * NAL unit stuff to context 0 and restart. Note that * rbsp_buffer is not transferred, but since we no longer |