diff options
| author | Jingning Han <jingning@google.com> | 2014-10-16 12:35:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-16 12:35:11 -0700 |
| commit | 4b5f01e12e8efb890b78e779b4736155d16dd38c (patch) | |
| tree | 1644c0b2769b7d94454c0f54e7f4b4ed28977d86 /vp9 | |
| parent | d86d834fcb153281c6c470700011385c1849927a (diff) | |
| parent | ed100c0b007684d1432f16cce3b171e3a76691c0 (diff) | |
| download | libvpx-4b5f01e12e8efb890b78e779b4736155d16dd38c.tar libvpx-4b5f01e12e8efb890b78e779b4736155d16dd38c.tar.gz libvpx-4b5f01e12e8efb890b78e779b4736155d16dd38c.tar.bz2 libvpx-4b5f01e12e8efb890b78e779b4736155d16dd38c.zip | |
Merge "Fix an ioc issue in super_block_uvrd"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 7565cc5c9..502089e6a 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1140,12 +1140,14 @@ static int super_block_uvrd(const VP9_COMP *cpi, MACROBLOCK *x, *sse = 0; *skippable = 1; - for (plane = 1; plane < MAX_MB_PLANE && is_cost_valid; ++plane) { + for (plane = 1; plane < MAX_MB_PLANE; ++plane) { txfm_rd_in_plane(x, &pnrate, &pndist, &pnskip, &pnsse, ref_best_rd, plane, bsize, uv_tx_size, cpi->sf.use_fast_coef_costing); - if (pnrate == INT_MAX) + if (pnrate == INT_MAX) { is_cost_valid = 0; + break; + } *rate += pnrate; *distortion += pndist; *sse += pnsse; |