Merge "Moving declaration of vp9_encode_frame() to vp9_encodeframe.h."

vp9/encoder/vp9_encodeframe.h

@@ -18,11 +18,14 @@ extern "C" {
 
 struct macroblock;
 struct yv12_buffer_config;
+struct VP9_COMP;
 
 void vp9_setup_src_planes(struct macroblock *x,
                           const struct yv12_buffer_config *src,
                           int mi_row, int mi_col);
 
+void vp9_encode_frame(struct VP9_COMP *cpi);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif

vp9/encoder/vp9_onyx_if.c

@@ -28,6 +28,7 @@
 #include "vp9/common/vp9_tile_common.h"
 
 #include "vp9/encoder/vp9_bitstream.h"
+#include "vp9/encoder/vp9_encodeframe.h"
 #include "vp9/encoder/vp9_encodemv.h"
 #include "vp9/encoder/vp9_firstpass.h"
 #include "vp9/encoder/vp9_mbgraph.h"

vp9/encoder/vp9_onyx_int.h

@@ -930,8 +930,6 @@ static YV12_BUFFER_CONFIG *get_ref_frame_buffer(VP9_COMP *cpi,
                                                              ref_frame)]].buf;
 }
 
-void vp9_encode_frame(VP9_COMP *cpi);
-
 void vp9_set_speed_features(VP9_COMP *cpi);
 
 int vp9_calc_ss_err(const YV12_BUFFER_CONFIG *source,