diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-03-12 21:27:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-12 21:27:04 -0700 |
| commit | 5784b9074a7dae90a3e6bcc84a49d5dbc504d0c6 (patch) | |
| tree | 8b6dfa1e2c9ca995ced26b3303acd57a6ae838f9 /vpxenc.c | |
| parent | 1aa75c65cc5985d70390fc95f021ad25c91d270c (diff) | |
| parent | 5dd146cb2643e62b849e8ddeed928b2f513355c0 (diff) | |
| download | libvpx-5784b9074a7dae90a3e6bcc84a49d5dbc504d0c6.tar libvpx-5784b9074a7dae90a3e6bcc84a49d5dbc504d0c6.tar.gz libvpx-5784b9074a7dae90a3e6bcc84a49d5dbc504d0c6.tar.bz2 libvpx-5784b9074a7dae90a3e6bcc84a49d5dbc504d0c6.zip | |
Merge changes Ic54c88ec,I6f120b65
* changes:
Added comment for vp9 only codec controls
Rename a vp9 only control with vp9e prefix
Diffstat (limited to 'vpxenc.c')
| -rw-r--r-- | vpxenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -457,7 +457,7 @@ static const int vp9_arg_ctrl_map[] = { VP9E_SET_TILE_COLUMNS, VP9E_SET_TILE_ROWS, VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE, VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT, - VP8E_SET_MAX_INTER_BITRATE_PCT, VP8E_SET_GF_CBR_BOOST_PCT, + VP8E_SET_MAX_INTER_BITRATE_PCT, VP9E_SET_GF_CBR_BOOST_PCT, VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE, VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_NOISE_SENSITIVITY, VP9E_SET_TUNE_CONTENT, VP9E_SET_COLOR_SPACE, |