vp8/rdopt.h+onyx_int.h: add some missing prototypes
silences missing prototype warnings
Change-Id: Icd477e37b502205d0a60e7389e51b1ba17d8888e
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index 977b0b0..4e234cc 100644
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -19,8 +19,6 @@
extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip);
-extern void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm);
-
static THREAD_FUNCTION thread_loopfilter(void *p_data)
{
VP8_COMP *cpi = (VP8_COMP *)(((LPFTHREAD_DATA *)p_data)->ptr1);
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index 75c1362..a6ff0e7 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -34,8 +34,6 @@
/* #define OUTPUT_FPF 1 */
extern void vp8cx_frame_init_quantizer(VP8_COMP *cpi);
-extern void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
-extern void vp8_alloc_compressor_data(VP8_COMP *cpi);
#define GFQ_ADJUSTMENT vp8_gf_boost_qadjustment[Q]
extern int vp8_kf_boost_qadjustment[QINDEX_RANGE];
@@ -1329,8 +1327,6 @@
return Q;
}
-extern void vp8_new_framerate(VP8_COMP *cpi, double framerate);
-
void vp8_init_second_pass(VP8_COMP *cpi)
{
FIRSTPASS_STATS this_frame;
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 82d7453..846c15b 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -714,6 +714,11 @@
} rd_costs;
} VP8_COMP;
+void vp8_alloc_compressor_data(VP8_COMP *cpi);
+int vp8_reverse_trans(int x);
+void vp8_new_framerate(VP8_COMP *cpi, double framerate);
+void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm);
+
void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest,
unsigned char *dest_end, unsigned long *size);
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index c4c0e7e..98ea5a0 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -29,8 +29,6 @@
#include "denoising.h"
#endif
-extern int VP8_UVSSE(MACROBLOCK *x);
-
#ifdef SPEEDSTATS
extern unsigned int cnt_pm;
#endif
@@ -38,8 +36,6 @@
extern const int vp8_ref_frame_order[MAX_MODES];
extern const MB_PREDICTION_MODE vp8_mode_order[MAX_MODES];
-extern int vp8_cost_mv_ref(MB_PREDICTION_MODE m, const int near_mv_ref_ct[4]);
-
// Fixed point implementation of a skin color classifier. Skin color
// is model by a Gaussian distribution in the CbCr color space.
// See ../../test/skin_color_detector_test.cc where the reference
diff --git a/vp8/encoder/rdopt.h b/vp8/encoder/rdopt.h
index e0da35e..b4fcd10 100644
--- a/vp8/encoder/rdopt.h
+++ b/vp8/encoder/rdopt.h
@@ -136,6 +136,9 @@
int near_sadidx[]
);
void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
+int VP8_UVSSE(MACROBLOCK *x);
+int vp8_cost_mv_ref(MB_PREDICTION_MODE m, const int near_mv_ref_ct[4]);
+void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
#ifdef __cplusplus
} // extern "C"
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index af9cc73..db4c528 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -478,8 +478,6 @@
return res;
}
-int vp8_reverse_trans(int);
-
static vpx_codec_err_t get_quantizer(vpx_codec_alg_priv_t *ctx, va_list args)
{
int *const arg = va_arg(args, int *);
