diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-07-25 12:18:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-25 12:18:51 -0700 |
| commit | 51a84588224b6a7d9852f194b16e65753ba80f81 (patch) | |
| tree | 56ca86fca98fdb944ecead78b3e7e03afbfd2c58 /vp9 | |
| parent | 08202e0ae0d26f5bef82cef31972b91db8e4da86 (diff) | |
| parent | 3e386aefc20333209639a19f1a3a5559c25de2c2 (diff) | |
| download | libvpx-51a84588224b6a7d9852f194b16e65753ba80f81.tar libvpx-51a84588224b6a7d9852f194b16e65753ba80f81.tar.gz libvpx-51a84588224b6a7d9852f194b16e65753ba80f81.tar.bz2 libvpx-51a84588224b6a7d9852f194b16e65753ba80f81.zip | |
Merge "fix a bug where flags are not reset"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 798adc1f3..5fe136ece 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1213,6 +1213,10 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp, } save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize); + x->fast_ms = 0; + x->pred_mv.as_int = 0; + x->subblock_ref = 0; + if (cpi->sf.adjust_partitioning_from_last_frame) { // Check if any of the sub blocks are further split. if (partition == PARTITION_SPLIT && subsize > BLOCK_SIZE_SB8X8) { |