diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-05-11 10:51:05 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-05-11 10:51:05 -0700 |
| commit | 44d35f7b257cc3e737a38eb9537d57c3e0479885 (patch) | |
| tree | d6a93b58cecf28c982437d8f8f7694d944c1e980 /vp8/encoder/encodeframe.c | |
| parent | c7ca3808322e4ff6a26d2184137c1dfa94f97024 (diff) | |
| parent | 297dc90255cf9511bea26c1056aa5e118dae9028 (diff) | |
| download | libvpx-44d35f7b257cc3e737a38eb9537d57c3e0479885.tar libvpx-44d35f7b257cc3e737a38eb9537d57c3e0479885.tar.gz libvpx-44d35f7b257cc3e737a38eb9537d57c3e0479885.tar.bz2 libvpx-44d35f7b257cc3e737a38eb9537d57c3e0479885.zip | |
Merge branch 'origin/eider' into master
Conflicts:
vp8/common/entropymode.c
vp8/common/entropymode.h
vp8/encoder/encodeframe.c
vp8/vp8_cx_iface.c
Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 5c607d961..f0ffaea44 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -31,6 +31,7 @@ #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING #include "bitstream.h" #endif +#include "encodeframe.h" extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) ; extern void vp8_calc_ref_frame_costs(int *ref_frame_cost, @@ -46,13 +47,6 @@ extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi, MB_ROW_COMP *mbr_ei, int mb_row, int count); -void vp8_build_block_offsets(MACROBLOCK *x); -void vp8_setup_block_ptrs(MACROBLOCK *x); -int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, - int recon_yoffset, int recon_uvoffset, - int mb_row, int mb_col); -int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, - TOKENEXTRA **t); static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ); #ifdef MODE_STATS @@ -596,7 +590,7 @@ void encode_mb_row(VP8_COMP *cpi, x->partition_info++; } -void init_encode_frame_mb_context(VP8_COMP *cpi) +static void init_encode_frame_mb_context(VP8_COMP *cpi) { MACROBLOCK *const x = & cpi->mb; VP8_COMMON *const cm = & cpi->common; |