For real-time/nonrd_pickmode: under some conditions
force check of intra modes for flat blocks with motion.
Reduces artifacts for screen-content mode.
Change-Id: If320f41a90982b14c48d91150f59f048a62982b1
if (sf->short_circuit_flat_blocks && x->source_variance == 0 &&
(frame_mv[this_mode][ref_frame].as_int != 0 ||
- (svc->spatial_layer_id == 0 && cpi->rc.re_encode_maxq_scene_change &&
+ (cpi->oxcf.content == VP9E_CONTENT_SCREEN && !svc->spatial_layer_id &&
!x->zero_temp_sad_source))) {
continue;
}