Merge changes Iece22223,Iefad9d8d

* changes:
  Fix two msvc build issues
  Fix enc/dec mismatches for aq-mode 1 and 2

diff --cc vp10/encoder/encodeframe.c
index bcdcff3d341aad23c021718a4bb192e42a510875,f1814a9291ea413fb40cac3e9f7560eae933a910..44ca2762ed97ae3dd00d55b96def69bddd37c318
--- 1/vp10/encoder/encodeframe.c
--- 2/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@@ -2699,19 -2695,13 +2699,15 @@@ static void encode_frame_internal(VP10_
    vp10_zero(rdc->coef_counts);
    vp10_zero(rdc->comp_pred_diff);
    vp10_zero(rdc->filter_diff);
 +  rdc->m_search_count = 0;   // Count of motion search hits.
 +  rdc->ex_search_count = 0;  // Exhaustive mesh search hits.
  
-   for (i = 0; i < (cm->seg.enabled ? MAX_SEGMENTS : 1); ++i) {
- #if CONFIG_MISC_FIXES
-     const int qindex = vp10_get_qindex(&cm->seg, i, cm->base_qindex);
- #endif
-     xd->lossless[i] = cm->y_dc_delta_q == 0 &&
- #if CONFIG_MISC_FIXES
-                       qindex == 0 &&
- #else
-                       cm->base_qindex == 0 &&
- #endif
+   for (i = 0; i < MAX_SEGMENTS; ++i) {
+     const int qindex = CONFIG_MISC_FIXES && cm->seg.enabled ?
+                        vp10_get_qindex(&cm->seg, i, cm->base_qindex) :
+                        cm->base_qindex;
+     xd->lossless[i] = qindex == 0 &&
+                       cm->y_dc_delta_q == 0 &&
                        cm->uv_dc_delta_q == 0 &&
                        cm->uv_ac_delta_q == 0;
    }