diff options
| author | Jingning Han <jingning@google.com> | 2014-10-07 17:10:38 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-10-08 16:09:47 -0700 |
| commit | 41cea461543d8cb2938e7dbda9643e9b6d56412a (patch) | |
| tree | fa1d970678e9039c9074bbd1dffe488165c80269 /vp9/encoder/vp9_rdopt.c | |
| parent | f6ff752c6321af8502be8fd0bc6b6192a825c76b (diff) | |
| download | libvpx-41cea461543d8cb2938e7dbda9643e9b6d56412a.tar libvpx-41cea461543d8cb2938e7dbda9643e9b6d56412a.tar.gz libvpx-41cea461543d8cb2938e7dbda9643e9b6d56412a.tar.bz2 libvpx-41cea461543d8cb2938e7dbda9643e9b6d56412a.zip | |
Use local variable in vp9_rd_pick_inter_mode_sb
Change-Id: Ie35a965a6b8de536ccaf61ff61498620d22db205
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 1af57339a..14c6a5140 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2871,7 +2871,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi[0].src_mi->mbmi; const struct segmentation *const seg = &cm->seg; - struct macroblockd_plane *const pd = xd->plane; PREDICTION_MODE this_mode; MV_REFERENCE_FRAME ref_frame, second_ref_frame; unsigned char segment_id = mbmi->segment_id; @@ -3225,16 +3224,15 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, if (ref_frame == INTRA_FRAME) { TX_SIZE uv_tx; - + struct macroblockd_plane *const pd = &xd->plane[1]; vpx_memset(x->skip_txfm, 0, sizeof(x->skip_txfm)); super_block_yrd(cpi, x, &rate_y, &distortion_y, &skippable, NULL, bsize, tx_cache, best_rd); - if (rate_y == INT_MAX) continue; - uv_tx = get_uv_tx_size_impl(mbmi->tx_size, bsize, pd[1].subsampling_x, - pd[1].subsampling_y); + uv_tx = get_uv_tx_size_impl(mbmi->tx_size, bsize, pd->subsampling_x, + pd->subsampling_y); if (rate_uv_intra[uv_tx] == INT_MAX) { choose_intra_uv_mode(cpi, ctx, bsize, uv_tx, &rate_uv_intra[uv_tx], &rate_uv_tokenonly[uv_tx], |