Commit d9bb7fc3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '816e5b99'

* commit '816e5b99':
  hevc: Reject impossible slice segment

Conflicts:
	libavcodec/hevc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 493f750e 816e5b99
......@@ -701,6 +701,11 @@ static int hls_slice_header(HEVCContext *s)
sh->slice_ctb_addr_rs = sh->slice_segment_addr;
if (!s->sh.slice_ctb_addr_rs && s->sh.dependent_slice_segment_flag) {
av_log(s->avctx, AV_LOG_ERROR, "Impossible slice segment.\n");
return AVERROR_INVALIDDATA;
}
s->HEVClc->first_qp_group = !s->sh.dependent_slice_segment_flag;
if (!s->pps->cu_qp_delta_enabled_flag)
......
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