Merge "bug fix: do not set noise sensitivity in vp8_scalable_patterns.c"

diff --combined vp8_scalable_patterns.c
index f3464aa,424e966..aa931e2
--- 1/vp8_scalable_patterns.c
--- 2/vp8_scalable_patterns.c
+++ b/vp8_scalable_patterns.c
@@@ -156,7 -156,7 +156,7 @@@ int main(int argc, char **argv) 
      if (argc != 8+mode_to_num_layers[layering_mode])
          die ("Invalid number of arguments");
  
 -    if (!vpx_img_alloc (&raw, VPX_IMG_FMT_I420, width, height, 1))
 +    if (!vpx_img_alloc (&raw, VPX_IMG_FMT_I420, width, height, 32))
          die ("Failed to allocate image", width, height);
  
      printf("Using %s\n",vpx_codec_iface_name(interface));
@@@ -493,7 -493,6 +493,6 @@@
      // Cap CPU & first I-frame size
      vpx_codec_control (&codec, VP8E_SET_CPUUSED,                -6);
      vpx_codec_control (&codec, VP8E_SET_STATIC_THRESHOLD,      800);
-     vpx_codec_control (&codec, VP8E_SET_NOISE_SENSITIVITY,       2);
  
      max_intra_size_pct = (int) (((double)cfg.rc_buf_optimal_sz * 0.5)
                           * ((double) cfg.g_timebase.den / cfg.g_timebase.num)