libvpx: Pull from upstream

source/libvpx/examples/twopass_encoder.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 150 matching lines @@
 
   if (!vpx_img_alloc(&raw, VPX_IMG_FMT_I420, info.frame_width,
                                              info.frame_height, 1)) {
     die("Failed to allocate image", info.frame_width, info.frame_height);
   }
 
   writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info);
   if (!writer)
     die("Failed to open %s for writing", outfile_arg);
 
-  printf("Using %s\n", vpx_codec_iface_name(encoder->interface()));
+  printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
 
-  res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0);
+  res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
   if (res)
     die_codec(&codec, "Failed to get default codec config.");
 
   cfg.g_w = info.frame_width;
   cfg.g_h = info.frame_height;
   cfg.g_timebase.num = info.time_base.numerator;
   cfg.g_timebase.den = info.time_base.denominator;
   cfg.rc_target_bitrate = bitrate;
 
   for (pass = 0; pass < 2; ++pass) {
     int frame_count = 0;
 
     if (pass == 0) {
       cfg.g_pass = VPX_RC_FIRST_PASS;
     } else {
       cfg.g_pass = VPX_RC_LAST_PASS;
       cfg.rc_twopass_stats_in = stats;
     }
 
     if (!(infile = fopen(infile_arg, "rb")))
       die("Failed to open %s for reading", infile_arg);
 
-    if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0))
+    if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0))
       die_codec(&codec, "Failed to initialize encoder");
 
     while (vpx_img_read(&raw, infile)) {
       ++frame_count;
 
       if (pass == 0) {
         get_frame_stats(&codec, &raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY,
                         &stats);
       } else {
         encode_frame(&codec, &raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY,
@@ skipping 14 matching lines @@
       die_codec(&codec, "Failed to destroy codec.");
   }
 
   vpx_img_free(&raw);
   free(stats.buf);
 
   vpx_video_writer_close(writer);
 
   return EXIT_SUCCESS;
 }