diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-08 16:17:38 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-08 16:17:38 -0800 |
| commit | ee1e4e645acd0e997040281eb4b59ff7d20a860e (patch) | |
| tree | 444b3ed27eaf4363dee4c607ed7a30690b084c21 | |
| parent | e731b2ba2cdb6f3f38b701a19dc5c035a2232371 (diff) | |
| parent | a596975eb6f576127ffd7299d75d5478cf6034de (diff) | |
| download | libvpx-ee1e4e645acd0e997040281eb4b59ff7d20a860e.tar libvpx-ee1e4e645acd0e997040281eb4b59ff7d20a860e.tar.gz libvpx-ee1e4e645acd0e997040281eb4b59ff7d20a860e.tar.bz2 libvpx-ee1e4e645acd0e997040281eb4b59ff7d20a860e.zip | |
Merge "Correct a couple of typos"
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 7d92e73f2..254ab1e9a 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -891,8 +891,8 @@ static const uint8_t *decode_tiles(VP9D_COMP *pbi, const uint8_t *data) { 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. diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 87bd36c2b..07a67a585 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1217,7 +1217,7 @@ static size_t encode_tiles(VP9_COMP *cpi, uint8_t *data_ptr) { 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) |