diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2011-12-19 08:42:20 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2011-12-19 08:42:20 -0800 |
| commit | fd294c553aa63d8047e5c8e20c37bac9b2185e15 (patch) | |
| tree | 843e383175709f0fbfca4e0aa8d08833f3dbd1ce /vp8/vp8_cx_iface.c | |
| parent | 0ccefd2c8f82d4aacc0b8410788caaa36c5602eb (diff) | |
| parent | c647ec4462640ae2aff569ac4bb46aa702581596 (diff) | |
| download | libvpx-fd294c553aa63d8047e5c8e20c37bac9b2185e15.tar libvpx-fd294c553aa63d8047e5c8e20c37bac9b2185e15.tar.gz libvpx-fd294c553aa63d8047e5c8e20c37bac9b2185e15.tar.bz2 libvpx-fd294c553aa63d8047e5c8e20c37bac9b2185e15.zip | |
Merge "Merge mr_pick_inter_mode and pick_inter_mode"
Diffstat (limited to 'vp8/vp8_cx_iface.c')
| -rw-r--r-- | vp8/vp8_cx_iface.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index de38baf7e..a467daa9e 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -361,6 +361,10 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf, } #if CONFIG_MULTI_RES_ENCODING + /* When mr_cfg is NULL, oxcf->mr_total_resolutions and oxcf->mr_encoder_id + * are both memset to 0, which ensures the correct logic under this + * situation. + */ if(mr_cfg) { oxcf->mr_total_resolutions = mr_cfg->mr_total_resolutions; |