diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:03:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:06:20 +0100 |
| commit | 241943d3a2acff65b4ff046e8b590583f23f6edb (patch) | |
| tree | 303d9125f4957924131298369c9704deddfbad08 /libavcodec/hevc.c | |
| parent | acbc2ed26ab6d1f3fbd0db3c594672561a692d99 (diff) | |
| parent | b2bece5e9a4dd96142962c6798e187c77b88bbfa (diff) | |
Merge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa'
* commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa':
hevc: always clip luma_log2_weight_denom
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 9a6d0b3c35..2dccfc1015 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -144,7 +144,7 @@ static void pred_weight_table(HEVCContext *s, GetBitContext *gb) uint8_t luma_weight_l1_flag[16]; uint8_t chroma_weight_l1_flag[16]; - s->sh.luma_log2_weight_denom = get_ue_golomb_long(gb); + s->sh.luma_log2_weight_denom = av_clip_c(get_ue_golomb_long(gb), 0, 7); if (s->sps->chroma_format_idc != 0) { int delta = get_se_golomb(gb); s->sh.chroma_log2_weight_denom = av_clip(s->sh.luma_log2_weight_denom + delta, 0, 7); |