]> granicus.if.org Git - libvpx/commitdiff
Fix a problem of using an uninitialized parameter
authorYaowu Xu <yaowu@google.com>
Fri, 30 May 2014 17:15:30 +0000 (10:15 -0700)
committerYaowu Xu <yaowu@google.com>
Fri, 30 May 2014 17:18:54 +0000 (10:18 -0700)
This commit added a call to set speed feature before initializing
motion search, fixed the problem where unintialized search method
is used before its value being set.

Change-Id: I537e4612bf0d00fd6f51396fd222d4b3bd6fde58

vp9/encoder/vp9_encoder.c

index 90155f3a98cc8c93feff3686e08a4426b271b37a..4170fbecc40cec16e8bffa54b7874d70cf92bdfa 100644 (file)
@@ -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);
 }