ref: 58cf8bef86547811d531439ca3ff8392826b7871
parent: 09cbb6c1f7ebca28f46c4f183747edfb60b62623
parent: a7657056b6a6af954399ad5846876c60530d0c4a
author: Adrian Grange <agrange@google.com>
date: Wed May 7 05:03:02 EDT 2014
Merge "Mark VP8E_SET_ARNR_TYPE as being deprecated"
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -162,8 +162,10 @@
VP8E_SET_ARNR_MAXFRAMES, /**< control function to set the max number of frames blurred creating arf*/
VP8E_SET_ARNR_STRENGTH, //!< control function to set the filter
//!< strength for the arf
- VP8E_SET_ARNR_TYPE, //!< control function to set the type of
- //!< filter to use for the arf
+
+ /*!\deprecated control function to set the filter type to use for the arf */
+ VP8E_SET_ARNR_TYPE,
+
VP8E_SET_TUNING, /**< control function to set visual tuning */
/*!\brief control function to set constrained quality level
*
@@ -349,7 +351,7 @@
VPX_CTRL_USE_TYPE(VP8E_SET_ARNR_MAXFRAMES, unsigned int)
VPX_CTRL_USE_TYPE(VP8E_SET_ARNR_STRENGTH, unsigned int)
-VPX_CTRL_USE_TYPE(VP8E_SET_ARNR_TYPE, unsigned int)
+VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_ARNR_TYPE, unsigned int)
VPX_CTRL_USE_TYPE(VP8E_SET_TUNING, int) /* vp8e_tuning */
VPX_CTRL_USE_TYPE(VP8E_SET_CQ_LEVEL, unsigned int)