Commit f7084f35 authored by John Koleszar's avatar John Koleszar
Browse files

Merge remote branch 'origin/master' into experimental

Change-Id: I0aaefeafeb6b2b07ec792024edf4751f2860aa23
parents 06f30739 800b70a3
...@@ -1255,7 +1255,11 @@ int vp8cx_encode_inter_macroblock ...@@ -1255,7 +1255,11 @@ int vp8cx_encode_inter_macroblock
cpi->zbin_mode_boost = MV_ZBIN_BOOST; cpi->zbin_mode_boost = MV_ZBIN_BOOST;
} }
} }
vp8_update_zbin_extra(cpi, x);
/* The fast quantizer doesn't use zbin_extra, only do so with
* the regular quantizer. */
if (cpi->sf.improved_quant)
vp8_update_zbin_extra(cpi, x);
} }
cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++; cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment