diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-02 00:05:12 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-02 00:05:13 -0400 |
| commit | 32817d6fbe5169413ea05e33bf5a509fcf9f4218 (patch) | |
| tree | 283a0c34c08897378cb3e8ea60f173e0d1a11838 /vp8/encoder/onyx_if.c | |
| parent | 2289ba4b9c98ab2f34daaff53f131ff79f5ed59d (diff) | |
| parent | 4101b5c5edf3f1257f8f9870dc16ccd49df22708 (diff) | |
| download | libvpx-32817d6fbe5169413ea05e33bf5a509fcf9f4218.tar libvpx-32817d6fbe5169413ea05e33bf5a509fcf9f4218.tar.gz libvpx-32817d6fbe5169413ea05e33bf5a509fcf9f4218.tar.bz2 libvpx-32817d6fbe5169413ea05e33bf5a509fcf9f4218.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I993dbef81ca3d1638e16c4134aa8dc177e57875c
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 0472b63b9..faa5bda1c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4385,7 +4385,7 @@ static void encode_frame_to_data_rate vp8_clear_system_state(); //__asm emms; - if (cpi->total_coded_error_left != 0.0) + if (cpi->twopass.total_coded_error_left != 0.0) fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" "%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f" "%10.3f %8d\n", @@ -4400,9 +4400,9 @@ static void encode_frame_to_data_rate //cpi->avg_frame_qindex, cpi->zbin_over_quant, cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->frame_type, cpi->gfu_boost, - cpi->twopass.est_max_qcorrection_factor, (int)cpi->bits_left, - cpi->total_coded_error_left, - (double)cpi->bits_left / cpi->total_coded_error_left, + cpi->twopass.est_max_qcorrection_factor, (int)cpi->twopass.bits_left, + cpi->twopass.total_coded_error_left, + (double)cpi->twopass.bits_left / cpi->twopass.total_coded_error_left, cpi->tot_recode_hits); else fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" @@ -4419,8 +4419,8 @@ static void encode_frame_to_data_rate //cpi->avg_frame_qindex, cpi->zbin_over_quant, cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->frame_type, cpi->gfu_boost, - cpi->twopass.est_max_qcorrection_factor, (int)cpi->bits_left, - cpi->total_coded_error_left, cpi->tot_recode_hits); + cpi->twopass.est_max_qcorrection_factor, (int)cpi->twopass.bits_left, + cpi->twopass.total_coded_error_left, cpi->tot_recode_hits); fclose(f); |