diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:40:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:40:30 +0100 |
| commit | d9bb7fc3cb18fbce3a0ddc18541d5537b2e8d9a4 (patch) | |
| tree | a5e668a62e5fdfc9407c065cf8d74ae3f2efed71 /libavcodec/hevc.c | |
| parent | 493f750e7a50f93de0cc972f6f0233b685253a3f (diff) | |
| parent | 816e5b997028c8215c804b1e58b2388592ed612b (diff) | |
| download | ffmpeg-d9bb7fc3cb18fbce3a0ddc18541d5537b2e8d9a4.tar.gz | |
Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'
* commit '816e5b997028c8215c804b1e58b2388592ed612b':
hevc: Reject impossible slice segment
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 1884a1b39a..b067f52316 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -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) |