diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2013-10-24 09:13:41 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-24 09:13:41 -0700 |
| commit | 93ec31dff684b3f287792fc9b58147ae7ee3ec3f (patch) | |
| tree | 3e1a6603528166fba9764d2ee1bfbb317bdb9375 /vp9/decoder | |
| parent | eec622d178e2bdc1098fcb86e954800ce03138fa (diff) | |
| parent | 175c313a128fd3b543e73751dc2334af5c45a5fa (diff) | |
| download | libvpx-93ec31dff684b3f287792fc9b58147ae7ee3ec3f.tar libvpx-93ec31dff684b3f287792fc9b58147ae7ee3ec3f.tar.gz libvpx-93ec31dff684b3f287792fc9b58147ae7ee3ec3f.tar.bz2 libvpx-93ec31dff684b3f287792fc9b58147ae7ee3ec3f.zip | |
Merge "Improve scale_factors struct"
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 3ee8ba41d..08819e700 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -295,13 +295,13 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd, MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; const int ref = mbmi->ref_frame[idx] - LAST_FRAME; const YV12_BUFFER_CONFIG *cfg = &cm->yv12_fb[cm->active_ref_idx[ref]]; - const struct scale_factors *sf = &cm->active_ref_scale[ref]; - if (!vp9_is_valid_scale(sf)) + const struct scale_factors_common *sfc = &cm->active_ref_scale_comm[ref]; + if (!vp9_is_valid_scale(sfc)) vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, "Invalid scale factors"); - xd->scale_factor[idx] = *sf; - setup_pre_planes(xd, idx, cfg, mi_row, mi_col, sf); + xd->scale_factor[idx].sfc = sfc; + setup_pre_planes(xd, idx, cfg, mi_row, mi_col, &xd->scale_factor[idx]); xd->corrupted |= cfg->corrupted; } |