shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix an ioc issue in super_block_uvrd"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1140,12 +1140,14 @@

   *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;