diff options
| author | James Zern <jzern@google.com> | 2023-05-06 02:26:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-06 02:26:55 +0000 |
| commit | 4818f997fe43c96a96bbda2d3b9aac714dbcd920 (patch) | |
| tree | 513b1f821704c8829706d4b928ab83446eafabdc | |
| parent | 905f991acd22b4d1cbfab22223bb5c979fb5c3c9 (diff) | |
| parent | 28c5d70650356bf0c60c80d387608047bfdf6e09 (diff) | |
| download | libvpx-4818f997fe43c96a96bbda2d3b9aac714dbcd920.tar.gz | |
Merge "vp9_encoder: clear -Wshadow warning" into main
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index f76eec2b5..3231b2b5b 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -4448,10 +4448,13 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, uint8_t *dest const int orig_rc_max_frame_bandwidth = rc->max_frame_bandwidth; #if CONFIG_RATE_CTRL - const FRAME_UPDATE_TYPE update_type = - cpi->twopass.gf_group.update_type[cpi->twopass.gf_group.index]; - const ENCODE_FRAME_TYPE frame_type = get_encode_frame_type(update_type); - RATE_QSTEP_MODEL *rq_model = &cpi->rq_model[frame_type]; + RATE_QSTEP_MODEL *rq_model; + { + const FRAME_UPDATE_TYPE update_type = + cpi->twopass.gf_group.update_type[cpi->twopass.gf_group.index]; + const ENCODE_FRAME_TYPE frame_type = get_encode_frame_type(update_type); + rq_model = &cpi->rq_model[frame_type]; + } init_rq_history(rq_history); #endif // CONFIG_RATE_CTRL |