commit 26a9afc32c5b8fcad8fe3674b34f7c4d12692030
author Yaowu Xu <yaowu@google.com> Thu Aug 13 09:42:27 2015 -0700
committer Yaowu Xu <yaowu@google.com> Thu Aug 13 11:37:17 2015 -0700
tree d6177cd51940b795a1bb1534bcf6070f5e30dab3
parent fc7cbd1f606c7746d9444d18e487cac27ee98212

VP9_COMP -> VP10_COMP

Change-Id: I83b5c69621f9f28b742e5b13517d4e5b99c6cd26

vp10/encoder/rdopt.h

diff --git a/vp10/encoder/rdopt.h b/vp10/encoder/rdopt.h
index 78b0c22..b1a8036 100644
--- a/vp10/encoder/rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -21,24 +21,24 @@
 #endif
 
 struct TileInfo;
-struct VP9_COMP;
+struct VP10_COMP;
 struct macroblock;
 struct RD_COST;
 
-void vp10_rd_pick_intra_mode_sb(struct VP9_COMP *cpi, struct macroblock *x,
+void vp10_rd_pick_intra_mode_sb(struct VP10_COMP *cpi, struct macroblock *x,
                                struct RD_COST *rd_cost, BLOCK_SIZE bsize,
                                PICK_MODE_CONTEXT *ctx, int64_t best_rd);
 
-unsigned int vp10_get_sby_perpixel_variance(VP9_COMP *cpi,
+unsigned int vp10_get_sby_perpixel_variance(VP10_COMP *cpi,
                                            const struct buf_2d *ref,
                                            BLOCK_SIZE bs);
 #if CONFIG_VP9_HIGHBITDEPTH
-unsigned int vp10_high_get_sby_perpixel_variance(VP9_COMP *cpi,
+unsigned int vp10_high_get_sby_perpixel_variance(VP10_COMP *cpi,
                                                 const struct buf_2d *ref,
                                                 BLOCK_SIZE bs, int bd);
 #endif
 
-void vp10_rd_pick_inter_mode_sb(struct VP9_COMP *cpi,
+void vp10_rd_pick_inter_mode_sb(struct VP10_COMP *cpi,
                                struct TileDataEnc *tile_data,
                                struct macroblock *x,
                                int mi_row, int mi_col,
@@ -46,7 +46,7 @@
                                BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
                                int64_t best_rd_so_far);
 
-void vp10_rd_pick_inter_mode_sb_seg_skip(struct VP9_COMP *cpi,
+void vp10_rd_pick_inter_mode_sb_seg_skip(struct VP10_COMP *cpi,
                                         struct TileDataEnc *tile_data,
                                         struct macroblock *x,
                                         struct RD_COST *rd_cost,
@@ -54,12 +54,12 @@
                                         PICK_MODE_CONTEXT *ctx,
                                         int64_t best_rd_so_far);
 
-int vp10_internal_image_edge(struct VP9_COMP *cpi);
-int vp10_active_h_edge(struct VP9_COMP *cpi, int mi_row, int mi_step);
-int vp10_active_v_edge(struct VP9_COMP *cpi, int mi_col, int mi_step);
-int vp10_active_edge_sb(struct VP9_COMP *cpi, int mi_row, int mi_col);
+int vp10_internal_image_edge(struct VP10_COMP *cpi);
+int vp10_active_h_edge(struct VP10_COMP *cpi, int mi_row, int mi_step);
+int vp10_active_v_edge(struct VP10_COMP *cpi, int mi_col, int mi_step);
+int vp10_active_edge_sb(struct VP10_COMP *cpi, int mi_row, int mi_col);
 
-void vp10_rd_pick_inter_mode_sub8x8(struct VP9_COMP *cpi,
+void vp10_rd_pick_inter_mode_sub8x8(struct VP10_COMP *cpi,
                                    struct TileDataEnc *tile_data,
                                    struct macroblock *x,
                                    int mi_row, int mi_col,