From: James Zern <jzern@google.com>
Date: Fri, 20 Mar 2015 21:50:14 +0000 (-0700)
Subject: vp[89]_cx_iface.c: remove obsolete ABI checks
X-Git-Tag: v1.4.0~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fef91c9040452133e10438661920bc1dbfb1f2b0;p=libvpx

vp[89]_cx_iface.c: remove obsolete ABI checks

Change-Id: I49a7017e8adc18ff03d748cb328814a8a3e1bcf6
---

diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index 7d74e4199..6768ffdc3 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -1330,10 +1330,8 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] =
         30,                 /* rc_resize_up_thresold */
 
         VPX_VBR,            /* rc_end_usage */
-#if VPX_ENCODER_ABI_VERSION > (1 + VPX_CODEC_ABI_VERSION)
         {0},                /* rc_twopass_stats_in */
         {0},                /* rc_firstpass_mb_stats_in */
-#endif
         256,                /* rc_target_bandwidth */
         4,                  /* rc_min_quantizer */
         63,                 /* rc_max_quantizer */
@@ -1353,9 +1351,6 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] =
         0,                  /* kf_min_dist */
         128,                /* kf_max_dist */
 
-#if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
-        "vp8.fpf"           /* first pass filename */
-#endif
         VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */
         {0},
         {0},                /* ss_target_bitrate */
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index 630645a5a..0ce37aae7 100644
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -1450,10 +1450,8 @@ static vpx_codec_enc_cfg_map_t encoder_usage_cfg_map[] = {
       30,                 // rc_resize_up_thresold
 
       VPX_VBR,            // rc_end_usage
-#if VPX_ENCODER_ABI_VERSION > (1 + VPX_CODEC_ABI_VERSION)
       {NULL, 0},          // rc_twopass_stats_in
       {NULL, 0},          // rc_firstpass_mb_stats_in
-#endif
       256,                // rc_target_bandwidth
       0,                  // rc_min_quantizer
       63,                 // rc_max_quantizer
@@ -1481,9 +1479,6 @@ static vpx_codec_enc_cfg_map_t encoder_usage_cfg_map[] = {
       {0},                    // ts_rate_decimator
       0,                      // ts_periodicity
       {0},                    // ts_layer_id
-#if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
-      "vp8.fpf"           // first pass filename
-#endif
     }
   },
 };