From 7f6f07035edaf9bf4be95114defbd63d2ab7ad38 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 29 Oct 2012 21:39:44 -0700 Subject: [PATCH] segmentation: make local symbols static. Change-Id: Ia30924dc095663b04794902522308d822c1a5ad0 --- vp8/encoder/bitstream.c | 2 +- vp8/encoder/segmentation.c | 2 +- vp8/encoder/segmentation.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 7b3822717..92ef46905 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1929,7 +1929,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) // If it is, then indicate the method that will be used. if (xd->update_mb_segmentation_map) { // Select the coding strategy (temporal or spatial) - choose_segmap_coding_method(cpi); + vp9_choose_segmap_coding_method(cpi); // Send the tree probabilities used to decode unpredicted // macro-block segments for (i = 0; i < MB_FEATURE_TREE_PROBS; i++) { diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c index f6f3f3110..4071839e8 100644 --- a/vp8/encoder/segmentation.c +++ b/vp8/encoder/segmentation.c @@ -160,7 +160,7 @@ static int cost_segmap(MACROBLOCKD *xd, } -void choose_segmap_coding_method(VP8_COMP *cpi) { +void vp9_choose_segmap_coding_method(VP8_COMP *cpi) { VP8_COMMON *const cm = &cpi->common; MACROBLOCKD *const xd = &cpi->mb.e_mbd; diff --git a/vp8/encoder/segmentation.h b/vp8/encoder/segmentation.h index 80e09fabb..88217dff8 100644 --- a/vp8/encoder/segmentation.h +++ b/vp8/encoder/segmentation.h @@ -38,6 +38,6 @@ extern void vp8_set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_ma // extern void vp8_set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta); -extern void choose_segmap_coding_method(VP8_COMP *cpi); +extern void vp9_choose_segmap_coding_method(VP8_COMP *cpi); #endif /* __INC_SEGMENTATION_H__ */ -- 2.50.1