diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-30 09:12:17 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-01-30 09:12:17 -0800 |
| commit | 4d53a95a3456bc96d8bb29ff30a7f1686d164301 (patch) | |
| tree | 81627aec5d5c72eb4b2fff198ff95166df1052f5 /vp9 | |
| parent | de6718a3b94f1642349ad85556394fa93044f899 (diff) | |
| parent | 3febf9707d6bac6ef6e50812e131fc84dc13cf6a (diff) | |
| download | libvpx-4d53a95a3456bc96d8bb29ff30a7f1686d164301.tar libvpx-4d53a95a3456bc96d8bb29ff30a7f1686d164301.tar.gz libvpx-4d53a95a3456bc96d8bb29ff30a7f1686d164301.tar.bz2 libvpx-4d53a95a3456bc96d8bb29ff30a7f1686d164301.zip | |
Merge "Default superblock skip flag to 32x32 for skip-blocks." into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index bb6b4fb6f..779069847 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -4955,7 +4955,7 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, mbmi->mb_skip_coeff = (cpi->common.mb_no_coeff_skip) ? 1 : 0; mbmi->partitioning = 0; mbmi->txfm_size = cm->txfm_mode == TX_MODE_SELECT ? - TX_16X16 : cm->txfm_mode; + TX_32X32 : cm->txfm_mode; vpx_memset(best_txfm_diff, 0, sizeof(best_txfm_diff)); vpx_memset(best_pred_diff, 0, sizeof(best_pred_diff)); |