diff options
| author | hkuang <hkuang@google.com> | 2014-10-09 15:43:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-09 15:43:31 -0700 |
| commit | 336e25523669bcc3855b283ee92bcb3e519754d5 (patch) | |
| tree | c86ee49c72324013d601c0a49ac757294c0978ca /vp9/decoder/vp9_decodeframe.c | |
| parent | 9a29fdbae7fbeba8e021f6cbec6a81771b50fd57 (diff) | |
| parent | 15a3e5f74234b96559a4b116f8dca50901367587 (diff) | |
| download | libvpx-336e25523669bcc3855b283ee92bcb3e519754d5.tar libvpx-336e25523669bcc3855b283ee92bcb3e519754d5.tar.gz libvpx-336e25523669bcc3855b283ee92bcb3e519754d5.tar.bz2 libvpx-336e25523669bcc3855b283ee92bcb3e519754d5.zip | |
Merge "Remove unnecessary scale check in set_ref."
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 8263467fe..3a184a5ba 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -389,9 +389,6 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd, MB_MODE_INFO *const mbmi = &xd->mi[0].src_mi->mbmi; RefBuffer *ref_buffer = &cm->frame_refs[mbmi->ref_frame[idx] - LAST_FRAME]; xd->block_refs[idx] = ref_buffer; - if (!vp9_is_valid_scale(&ref_buffer->sf)) - vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, - "Invalid scale factors"); if (ref_buffer->buf->corrupted) vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, "Block reference is corrupt"); |