diff options
| author | Adrian Grange <agrange@google.com> | 2014-05-07 09:03:02 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-07 09:03:02 -0700 |
| commit | 58cf8bef86547811d531439ca3ff8392826b7871 (patch) | |
| tree | 68bc9f84444cb90fd85f716371a47b6fa1666583 /vpx | |
| parent | 09cbb6c1f7ebca28f46c4f183747edfb60b62623 (diff) | |
| parent | a7657056b6a6af954399ad5846876c60530d0c4a (diff) | |
| download | libvpx-58cf8bef86547811d531439ca3ff8392826b7871.tar.gz libvpx-58cf8bef86547811d531439ca3ff8392826b7871.tar.bz2 libvpx-58cf8bef86547811d531439ca3ff8392826b7871.zip | |
Merge "Mark VP8E_SET_ARNR_TYPE as being deprecated"
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/vp8cx.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index bc8df807e..67cbdb1f5 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -162,8 +162,10 @@ enum vp8e_enc_control_id { 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_TOKEN_PARTITIONS, int) /* vp8e_token_partitions */ 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) |