diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-16 09:56:05 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-06-16 09:56:05 -0700 |
| commit | eb645abeacc1cc3d8834aa09d969fd7bc6a06c83 (patch) | |
| tree | 5170e9121fade7b8404bc4495aedff6d07251513 /vp8/encoder | |
| parent | d9959e336eba090ab59f624f4223acecf5e02d39 (diff) | |
| parent | 299193dd1c20a27059de9fdac62a635e6dfffe66 (diff) | |
| download | libvpx-eb645abeacc1cc3d8834aa09d969fd7bc6a06c83.tar libvpx-eb645abeacc1cc3d8834aa09d969fd7bc6a06c83.tar.gz libvpx-eb645abeacc1cc3d8834aa09d969fd7bc6a06c83.tar.bz2 libvpx-eb645abeacc1cc3d8834aa09d969fd7bc6a06c83.zip | |
Merge "Disable specialcase for last frames if the sequence contains ARFs."
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/firstpass.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index b5d3ff926..0c30aeffe 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -1897,12 +1897,6 @@ static void assign_std_frame_bits(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame) int max_bits = frame_max_bits(cpi); // Max for a single frame - // The final few frames have special treatment - if (cpi->frames_till_gf_update_due >= (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame)) - { - cpi->twopass.gf_group_bits = (cpi->twopass.bits_left > 0) ? cpi->twopass.bits_left : 0;; - } - // Calculate modified prediction error used in bit allocation modified_err = calculate_modified_err(cpi, this_frame); |