diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-11 12:27:42 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-11 12:27:42 -0800 |
| commit | ec8128e27f47888e6a5c33ee089baca17a33d57e (patch) | |
| tree | 4d878f0d52a3c3ebe65e0d1ec248f38067f8f958 /vp9/decoder/vp9_decodframe.c | |
| parent | ab38f4f8fc763499552926086028a8bf212c5b37 (diff) | |
| parent | d28f30ef4e69d6217f20b758a1e2a14a1c7f3b98 (diff) | |
| download | libvpx-ec8128e27f47888e6a5c33ee089baca17a33d57e.tar libvpx-ec8128e27f47888e6a5c33ee089baca17a33d57e.tar.gz libvpx-ec8128e27f47888e6a5c33ee089baca17a33d57e.tar.bz2 libvpx-ec8128e27f47888e6a5c33ee089baca17a33d57e.zip | |
Merge "Replacing (raster_block >> tx_size) with (block >> (tx_size << 1))."
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 7e3bbaa16..aad400aa1 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -315,7 +315,7 @@ static void predict_and_reconstruct_intra_block(int plane, int block, if (xd->mb_to_right_edge < 0 || xd->mb_to_bottom_edge < 0) extend_for_intra(xd, plane_bsize, plane, block, tx_size); - vp9_predict_intra_block(xd, raster_block >> tx_size, + vp9_predict_intra_block(xd, block >> (tx_size << 1), b_width_log2(plane_bsize), tx_size, mode, dst, pd->dst.stride, dst, pd->dst.stride); |