diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-29 21:42:46 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-01-29 21:42:56 -0800 |
| commit | b90996c51b1cac61f6831f1bc50cfd99616a2a78 (patch) | |
| tree | 1b0f8769ea65e7e8a1cae3cc821879528e12ff1b /vp9/encoder | |
| parent | 2f6fce3e5a30c9016aa816e2d57678d88729af37 (diff) | |
| download | libvpx-b90996c51b1cac61f6831f1bc50cfd99616a2a78.tar libvpx-b90996c51b1cac61f6831f1bc50cfd99616a2a78.tar.gz libvpx-b90996c51b1cac61f6831f1bc50cfd99616a2a78.tar.bz2 libvpx-b90996c51b1cac61f6831f1bc50cfd99616a2a78.zip | |
Reset skip flag in superblock RD loop.
This is the superblock equivalent of commit 290b83a.
Change-Id: Ib3945dd9e992fa9ec1fdea5a11e17a3cc0e37637
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ebe08db90..bb6b4fb6f 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -4494,7 +4494,6 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, int dist_uv_16x16 = 0, uv_skip_16x16 = 0; MB_PREDICTION_MODE mode_uv_16x16 = NEARESTMV; - x->skip = 0; xd->mode_info_context->mbmi.segment_id = segment_id; estimate_ref_frame_costs(cpi, segment_id, ref_costs); vpx_memset(&best_mbmode, 0, sizeof(best_mbmode)); @@ -4581,6 +4580,7 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, continue; } + x->skip = 0; this_mode = vp9_mode_order[mode_index].mode; ref_frame = vp9_mode_order[mode_index].ref_frame; if (!(ref_frame == INTRA_FRAME || |