shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove delete_first_pass_file."

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -414,7 +414,6 @@

         printf("Sharpness: %d\n",    oxcf->Sharpness);

         printf("cpu_used: %d\n",  oxcf->cpu_used);

         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);

         printf("end_usage: %d\n", oxcf->end_usage);

@@ -1263,7 +1262,6 @@

         128,                /* kf_max_dist */

 #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)

-        1,                  /* g_delete_first_pass_file */

         "vp8.fpf"           /* first pass filename */

 #endif

         VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -316,9 +316,6 @@

   // oxcf->kf_min_dist         = cfg.kf_min_dis;

   oxcf->key_freq               = cfg.kf_max_dist;

-  // oxcf->delete_first_pass_file = cfg.g_delete_firstpassfile;

-  // strcpy(oxcf->first_pass_file, cfg.g_firstpass_file);

-

   oxcf->cpu_used               =  vp8_cfg.cpu_used;

   oxcf->encode_breakout        =  vp8_cfg.static_thresh;

   oxcf->play_alternate         =  vp8_cfg.enable_auto_alt_ref;

@@ -352,7 +349,6 @@

   printf("sharpness: %d\n",    oxcf->sharpness);

   printf("cpu_used: %d\n",  oxcf->cpu_used);

   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);

   printf("end_usage: %d\n", oxcf->end_usage);

@@ -1132,7 +1128,6 @@

       VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */

 #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)

-      1,                  /* g_delete_first_pass_file */

       "vp8.fpf"           /* first pass filename */

 #endif

     }