shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Replace cpi->common with preset variable cm"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -283,9 +283,9 @@

   mbmi->ref_frame[0] = NONE;

   mbmi->ref_frame[1] = NONE;

   mbmi->tx_size = MIN(max_txsize_lookup[bsize],

-                      tx_mode_to_biggest_tx_size[cpi->common.tx_mode]);

-  mbmi->interp_filter = cpi->common.interp_filter == SWITCHABLE ?

-                        EIGHTTAP : cpi->common.interp_filter;

+                      tx_mode_to_biggest_tx_size[cm->tx_mode]);

+  mbmi->interp_filter = cm->interp_filter == SWITCHABLE ?

+                        EIGHTTAP : cm->interp_filter;

   mbmi->skip = 0;

   mbmi->segment_id = segment_id;