diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-02-10 11:43:23 -0800 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2016-02-10 11:43:23 -0800 |
| commit | 0ae42ee1bd0e009e63d7ee93adf8759ac330fad8 (patch) | |
| tree | d80f5736a84b72ec0dd4df8877b521176fb28478 /vp9/decoder/vp9_decodeframe.c | |
| parent | ad08e0875bed28509f49c305cb846fa4d7179113 (diff) | |
| download | libvpx-0ae42ee1bd0e009e63d7ee93adf8759ac330fad8.tar libvpx-0ae42ee1bd0e009e63d7ee93adf8759ac330fad8.tar.gz libvpx-0ae42ee1bd0e009e63d7ee93adf8759ac330fad8.tar.bz2 libvpx-0ae42ee1bd0e009e63d7ee93adf8759ac330fad8.zip | |
VP9: Pass NULL scale_factors ptr when not scaling
to vp9_setup_pre_planes(), preventing the function
unscaled_value() from being called. unscaled_value()
returns the same value that was passed in. See
scaled_buffer_offset() in vp9_reconinter.h.
Change-Id: I2a6fbaf07972c2f212834929d29a2cbe72e399c3
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 39710c830..8a492d562 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -737,7 +737,8 @@ static void dec_build_inter_predictors_sb(VP9Decoder *const pbi, "Reference frame has invalid dimensions"); is_scaled = vp9_is_scaled(sf); - vp9_setup_pre_planes(xd, ref, ref_buf->buf, mi_row, mi_col, sf); + vp9_setup_pre_planes(xd, ref, ref_buf->buf, mi_row, mi_col, + is_scaled ? sf : NULL); xd->block_refs[ref] = ref_buf; if (sb_type < BLOCK_8X8) { |