shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp8cx.h: s/VP8E_(SET_MAX_INTER_BITRATE_PCT)/VP9E_$1/"

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -801,7 +801,7 @@

     vpx_codec_alg_priv_t *ctx, va_list args) {

   struct vp9_extracfg extra_cfg = ctx->extra_cfg;

   extra_cfg.rc_max_inter_bitrate_pct =

-      CAST(VP8E_SET_MAX_INTER_BITRATE_PCT, args);

+      CAST(VP9E_SET_MAX_INTER_BITRATE_PCT, args);

   return update_extra_cfg(ctx, &extra_cfg);

 }

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -933,8 +933,8 @@

 VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTRA_BITRATE_PCT, unsigned int)

 #define VPX_CTRL_VP8E_SET_MAX_INTRA_BITRATE_PCT

-VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTER_BITRATE_PCT, unsigned int)

-#define VPX_CTRL_VP8E_SET_MAX_INTER_BITRATE_PCT

+VPX_CTRL_USE_TYPE(VP9E_SET_MAX_INTER_BITRATE_PCT, unsigned int)

+#define VPX_CTRL_VP9E_SET_MAX_INTER_BITRATE_PCT

 VPX_CTRL_USE_TYPE(VP8E_SET_GF_CBR_BOOST_PCT, unsigned int)

 #define VPX_CTRL_VP8E_SET_GF_CBR_BOOST_PCT