diff options
| author | Jingning Han <jingning@google.com> | 2018-06-08 17:18:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-08 17:18:33 +0000 |
| commit | 18fa715c897acd63d3008263197290e5423f5fe2 (patch) | |
| tree | 4ba7be8ecf8e0043432542964b3b886185c766c9 | |
| parent | 9a9ff2d80485486e3de331080a257146724f51dc (diff) | |
| parent | 19ef82268328780c3deb3c5a09369977aa68c975 (diff) | |
| download | libvpx-18fa715c897acd63d3008263197290e5423f5fe2.tar libvpx-18fa715c897acd63d3008263197290e5423f5fe2.tar.gz libvpx-18fa715c897acd63d3008263197290e5423f5fe2.tar.bz2 libvpx-18fa715c897acd63d3008263197290e5423f5fe2.zip | |
Merge "Localize variable scope in vp9_rc_get_second_pass_params()"
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index c76dfd351..c347a32ed 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -3040,8 +3040,6 @@ void vp9_rc_get_second_pass_params(VP9_COMP *cpi) { GF_GROUP *const gf_group = &twopass->gf_group; FIRSTPASS_STATS this_frame; - int target_rate; - if (!twopass->stats_in) return; // If this is an arf frame then we dont want to read the stats file or @@ -3149,8 +3147,7 @@ void vp9_rc_get_second_pass_params(VP9_COMP *cpi) { cpi->partition_search_skippable_frame = is_skippable_frame(cpi); } - target_rate = gf_group->bit_allocation[gf_group->index]; - rc->base_frame_target = target_rate; + rc->base_frame_target = gf_group->bit_allocation[gf_group->index]; // The multiplication by 256 reverses a scaling factor of (>> 8) // applied when combining MB error values for the frame. |