ref: de6718a3b94f1642349ad85556394fa93044f899
parent: d28750537eaad88991f84239d1203282b65ca6dd
parent: b90996c51b1cac61f6831f1bc50cfd99616a2a78
author: Ronald S. Bultje <rbultje@google.com>
date: Wed Jan 30 04:12:02 EST 2013
Merge "Reset skip flag in superblock RD loop." into experimental
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4494,7 +4494,6 @@
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 @@
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 ||