diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-22 21:12:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-22 21:12:44 +0000 |
| commit | a85772826724694e968a5c9db88dc53cc17ad206 (patch) | |
| tree | 6e414abb9dd311f197caef978fb73b828a2fbefc | |
| parent | 40347d0c07a95e9f52dc77d9676db5de0c747986 (diff) | |
| parent | 558d93f3a5a41a75aa8c3bfce97c8e49509fcb7e (diff) | |
| download | libvpx-a85772826724694e968a5c9db88dc53cc17ad206.tar.gz | |
Merge "vp10: fix tile size in remuxing step."
| -rw-r--r-- | vp10/encoder/bitstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index c3bdd59e3..d9b4be4e5 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c @@ -1471,17 +1471,17 @@ static int remux_tiles(uint8_t *dest, const int sz, if (n == n_tiles - 1) { tile_sz = sz - rpos; } else { - tile_sz = mem_get_le32(&dest[rpos]); + tile_sz = mem_get_le32(&dest[rpos]) + 1; rpos += 4; switch (mag) { case 0: - dest[wpos] = tile_sz; + dest[wpos] = tile_sz - 1; break; case 1: - mem_put_le16(&dest[wpos], tile_sz); + mem_put_le16(&dest[wpos], tile_sz - 1); break; case 2: - mem_put_le24(&dest[wpos], tile_sz); + mem_put_le24(&dest[wpos], tile_sz - 1); break; case 3: // remuxing should only happen if mag < 3 default: |