diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-29 06:29:56 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-05-29 06:29:56 -0700 |
| commit | 4487f5a69059e44cf6400754bd2d9af42f74bb5f (patch) | |
| tree | 2c07dfcd65582739f91f461e2e32cde5be47a46a /vp9/encoder | |
| parent | 2afc3422c615570973f5abab6aefb95990b5c4db (diff) | |
| download | libvpx-4487f5a69059e44cf6400754bd2d9af42f74bb5f.tar libvpx-4487f5a69059e44cf6400754bd2d9af42f74bb5f.tar.gz libvpx-4487f5a69059e44cf6400754bd2d9af42f74bb5f.tar.bz2 libvpx-4487f5a69059e44cf6400754bd2d9af42f74bb5f.zip | |
Remove some unused code related to macroblock/splitmv coding.
Change-Id: Ic40d56fb162f4e201547dfae33e62ccd9e865889
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 1dd822b89..f296d9688 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -524,15 +524,6 @@ static void pack_mb_tokens(vp9_writer* const bc, *tp = p; } -static void write_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m, - const vp9_prob *p) { -#if CONFIG_DEBUG - assert(NEARESTMV <= m && m <= SPLITMV); -#endif - write_token(bc, vp9_mv_ref_tree, p, - vp9_mv_ref_encoding_array - NEARESTMV + m); -} - static void write_sb_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m, const vp9_prob *p) { #if CONFIG_DEBUG diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 2eb3f9b29..72c4308d5 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -927,8 +927,8 @@ int vp9_cost_mv_ref(VP9_COMP *cpi, vp9_prob p [VP9_MVREFS - 1]; assert(NEARESTMV <= m && m <= SPLITMV); vp9_mv_ref_probs(pc, p, mode_context); - return cost_token(vp9_mv_ref_tree, p, - vp9_mv_ref_encoding_array - NEARESTMV + m); + return cost_token(vp9_sb_mv_ref_tree, p, + vp9_sb_mv_ref_encoding_array - NEARESTMV + m); } else return 0; } |