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:43:10 -0300 |
| commit | a06cd0283eeadccff7a0e8a9214c01e816cfcad2 (patch) | |
| tree | 7622d4037e2592595c8c4b15513e71782a8aca97 /libavcodec | |
| parent | 4321092be3e39cff38289ebbdcdd9a99879fa474 (diff) | |
| download | ffmpeg-a06cd0283eeadccff7a0e8a9214c01e816cfcad2.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)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index f8aeb63aa1..eb052b55ea 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2795,6 +2795,10 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) } 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; + } ret = hevc_frame_start(s); if (ret < 0) return ret; |