diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-05-15 15:20:50 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-15 15:20:50 -0700 |
| commit | 2fd79c7a372f05cee5538419ae15a3812350fa2a (patch) | |
| tree | 58adf8e3839fb4470a78493a8ad0ca9d1196fabd /vp9 | |
| parent | 4466e83a221494361296fee2b7c1ea85157e547e (diff) | |
| parent | 21bb6ddb57ed0d9a38a67ed5d68d66ddb29da1d5 (diff) | |
| download | libvpx-2fd79c7a372f05cee5538419ae15a3812350fa2a.tar libvpx-2fd79c7a372f05cee5538419ae15a3812350fa2a.tar.gz libvpx-2fd79c7a372f05cee5538419ae15a3812350fa2a.tar.bz2 libvpx-2fd79c7a372f05cee5538419ae15a3812350fa2a.zip | |
Merge "vp9_firstpass.c: clean -wextra warnings"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index c6b6197fc..ec217bed5 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -61,6 +61,7 @@ #define MIN_GF_INTERVAL 4 #endif + // #define LONG_TERM_VBR_CORRECTION static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) { @@ -1421,10 +1422,13 @@ void define_fixed_arf_period(VP9_COMP *cpi) { static void calculate_section_intra_ratio(struct twopass_rc *twopass, const FIRSTPASS_STATS *start_pos, int section_length) { - FIRSTPASS_STATS next_frame = { 0 }; - FIRSTPASS_STATS sectionstats = { 0 }; + FIRSTPASS_STATS next_frame; + FIRSTPASS_STATS sectionstats; int i; + vp9_zero(next_frame); + vp9_zero(sectionstats); + reset_fpf_position(twopass, start_pos); for (i = 0; i < section_length; ++i) { @@ -1497,7 +1501,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { RATE_CONTROL *const rc = &cpi->rc; const VP9EncoderConfig *const oxcf = &cpi->oxcf; struct twopass_rc *const twopass = &cpi->twopass; - FIRSTPASS_STATS next_frame = { 0 }; + FIRSTPASS_STATS next_frame; const FIRSTPASS_STATS *start_pos; int i; double boost_score = 0.0; @@ -1524,10 +1528,10 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { int flash_detected; int active_max_gf_interval; - twopass->gf_group_bits = 0; - vp9_clear_system_state(); + vp9_zero(next_frame); + twopass->gf_group_bits = 0; start_pos = twopass->stats_in; // Load stats for the current frame. |