Merge "Renaming 'Sharpness' to 'sharpness'."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 9 Jan 2014 21:42:55 +0000 (13:42 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 9 Jan 2014 21:42:55 +0000 (13:42 -0800)
1  2 
vp9/common/vp9_onyx.h
vp9/encoder/vp9_onyx_if.c
vp9/vp9_cx_iface.c

Simple merge
Simple merge
@@@ -349,9 -349,9 +349,9 @@@ static vpx_codec_err_t set_vp9e_config(
    printf("Current VP9 Settings: \n");
    printf("target_bandwidth: %d\n", oxcf->target_bandwidth);
    printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity);
-   printf("Sharpness: %d\n",    oxcf->Sharpness);
+   printf("sharpness: %d\n",    oxcf->sharpness);
    printf("cpu_used: %d\n",  oxcf->cpu_used);
 -  printf("Mode: %d\n",     oxcf->Mode);
 +  printf("Mode: %d\n",     oxcf->mode);
    // printf("delete_first_pass_file: %d\n",  oxcf->delete_first_pass_file);
    printf("auto_key: %d\n",  oxcf->auto_key);
    printf("key_freq: %d\n", oxcf->key_freq);