diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-18 17:25:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-20 21:03:48 -0300 |
| commit | da6a61606a1936a6ccceb6a4868247a19309c140 (patch) | |
| tree | 645f3a3cbefbf07a414c622b3ad7104b8c027b5f | |
| parent | 15b385efca6a79e3762cfbfdd7a5678e245e811e (diff) | |
| download | ffmpeg-da6a61606a1936a6ccceb6a4868247a19309c140.tar.gz | |
avcodec/hevcdec: decode at most one slice reporting being the first in the picture
Fixes deadlocks when decoding packets containing more than one of the aforementioned
slices when using frame threads.
Tested-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 70c8c8a818f39bc262565ec29fae2baffb3e1660)
| -rw-r--r-- | libavcodec/hevcdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 89b121d2f0..734c42037a 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2864,6 +2864,10 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) return ret; if (s->sh.first_slice_in_pic_flag) { + if (s->ref) { + av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); + goto fail; + } if (s->max_ra == INT_MAX) { if (s->nal_unit_type == HEVC_NAL_CRA_NUT || IS_BLA(s)) { s->max_ra = s->poc; |