shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Correct a couple of typos"

--- a/vp9/decoder/vp9_decodframe.c

+++ b/vp9/decoder/vp9_decodframe.c

@@ -891,8 +891,8 @@

   const uint8_t *end = NULL;

   vp9_reader r;

-  assert(tile_rows < 4);

-  assert(tile_cols < (1 << 6));

+  assert(tile_rows <= 4);

+  assert(tile_cols <= (1 << 6));

   // Note: this memset assumes above_context[0], [1] and [2]

   // are allocated as part of the same buffer.

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -1217,7 +1217,7 @@

     for (tile_col = 0; tile_col < tile_cols; tile_col++) {

       TileInfo tile;

-      vp9_tile_init(&tile, cm, 0, tile_col);

+      vp9_tile_init(&tile, cm, tile_row, tile_col);

       tok_end = tok[tile_row][tile_col] + cpi->tok_count[tile_row][tile_col];

       if (tile_col < tile_cols - 1 || tile_row < tile_rows - 1)