diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-21 00:05:14 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-21 00:05:14 -0400 |
| commit | e4be958e08a15571d5ab7549e69f022082af5c6b (patch) | |
| tree | ff70badd75eb514dd56e0aa454efd99dcdd6894b /vp8/encoder/ratectrl.c | |
| parent | c9490763697fa9df2bf3666a572d7856208ae484 (diff) | |
| parent | ad6fe4a88c9d051a34c85d3f422cde5819f2bbdf (diff) | |
| download | libvpx-e4be958e08a15571d5ab7549e69f022082af5c6b.tar libvpx-e4be958e08a15571d5ab7549e69f022082af5c6b.tar.gz libvpx-e4be958e08a15571d5ab7549e69f022082af5c6b.tar.bz2 libvpx-e4be958e08a15571d5ab7549e69f022082af5c6b.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/ratectrl.c')
| -rw-r--r-- | vp8/encoder/ratectrl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index e8d12e2cf..78b3b4715 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -671,7 +671,7 @@ static void calc_pframe_target_size(VP8_COMP *cpi) { if (cpi->pass == 2) { - cpi->per_frame_bandwidth = cpi->gf_bits; // Per frame bit target for the alt ref frame + cpi->per_frame_bandwidth = cpi->twopass.gf_bits; // Per frame bit target for the alt ref frame cpi->this_frame_target = cpi->per_frame_bandwidth; } @@ -1100,7 +1100,6 @@ static void calc_pframe_target_size(VP8_COMP *cpi) } #endif - cpi->initial_gf_use = 0; if (cpi->auto_adjust_gold_quantizer) { @@ -1476,7 +1475,6 @@ void vp8_adjust_key_frame_context(VP8_COMP *cpi) } cpi->frames_since_key = 0; - cpi->last_key_frame_size = cpi->projected_frame_size; cpi->key_frame_count++; } |