diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-05-30 11:37:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-30 11:37:04 -0700 |
| commit | 2dc7f506d49f5a4513dee02b230e0a17074129e1 (patch) | |
| tree | 12e124ea8a343fa00d950158098d8c0be7775fcb /vp9 | |
| parent | 19b52001720ad2f69068e8665091efd6e5bd9345 (diff) | |
| parent | 538af7db5ffe2ab560511a3bc0ae74dae9316c14 (diff) | |
| download | libvpx-2dc7f506d49f5a4513dee02b230e0a17074129e1.tar libvpx-2dc7f506d49f5a4513dee02b230e0a17074129e1.tar.gz libvpx-2dc7f506d49f5a4513dee02b230e0a17074129e1.tar.bz2 libvpx-2dc7f506d49f5a4513dee02b230e0a17074129e1.zip | |
Merge "Fix a problem of using an uninitialized parameter"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 90155f3a9..4170fbecc 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -486,15 +486,11 @@ static void update_frame_size(VP9_COMP *cpi) { vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to reallocate scaled last source buffer"); - { - int y_stride = cpi->scaled_source.y_stride; - - if (cpi->sf.search_method == NSTEP) { - vp9_init3smotion_compensation(&cpi->ss_cfg, y_stride); - } else if (cpi->sf.search_method == DIAMOND) { - vp9_init_dsmotion_compensation(&cpi->ss_cfg, y_stride); - } - } + set_speed_features(cpi); + if (cpi->sf.search_method == NSTEP) + vp9_init3smotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride); + else if (cpi->sf.search_method == DIAMOND) + vp9_init_dsmotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride); init_macroblockd(cm, xd); } |