summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pick_status.json2
-rw-r--r--src/util/vl_rbsp.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index c1ee235878b..e0ad2657f6e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -374,7 +374,7 @@
"description": "util/rbsp: Fill bits twice if reading more than 16 bits",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null
diff --git a/src/util/vl_rbsp.h b/src/util/vl_rbsp.h
index 0842b0f1490..82043fc8752 100644
--- a/src/util/vl_rbsp.h
+++ b/src/util/vl_rbsp.h
@@ -138,6 +138,8 @@ static inline unsigned vl_rbsp_u(struct vl_rbsp *rbsp, unsigned n)
return 0;
vl_rbsp_fillbits(rbsp);
+ if (n > 16)
+ vl_rbsp_fillbits(rbsp);
return vl_vlc_get_uimsbf(&rbsp->nal, n);
}