Merge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa'

* commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa': hevc: always clip luma_log2_weight_denom Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 241943d3a2
parent acbc2ed26a b2bece5e9a
commit 241943d3a2
1 changed files with 1 additions and 1 deletions
--- 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);