ref: 9cb3a13426d21a9bcfbd4d71e045fa0199ab1bbd
parent: 02b3b05278089ff84db01750d50e8c3032701e51
parent: e8a3abe41e77fbd29408c8f7a8d16528ffe72b79
author: Debargha Mukherjee <[email protected]>
date: Tue Jul 7 10:25:34 EDT 2015
Merge "Adds macros for new encoder controls"
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -733,8 +733,10 @@
VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_SPACE, int)
VPX_CTRL_USE_TYPE(VP9E_SET_MIN_GF_INTERVAL, unsigned int)
+#define VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL
VPX_CTRL_USE_TYPE(VP9E_SET_MAX_GF_INTERVAL, unsigned int)
+#define VPX_CTRL_VP9E_SET_MAX_GF_INTERVAL
VPX_CTRL_USE_TYPE(VP9E_GET_ACTIVEMAP, vpx_active_map_t *)
/*! @} - end defgroup vp8_encoder */