diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
| commit | 5f6db3591c64b9d53a5cf76f3afc5c28027d0feb (patch) | |
| tree | d1507d4bff9f2308c8d42606c5345d435e9a6e24 /vp8/encoder/generic/csystemdependent.c | |
| parent | 4a1c3cf7d8bb38db15702f6fb772c9b94233c8e9 (diff) | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b (diff) | |
| download | libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.gz libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.bz2 libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06
Diffstat (limited to 'vp8/encoder/generic/csystemdependent.c')
| -rw-r--r-- | vp8/encoder/generic/csystemdependent.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c index 1123f1251..2f597619f 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp8/encoder/generic/csystemdependent.c @@ -17,8 +17,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi); void vp8_arch_arm_encoder_init(VP8_COMP *cpi); - -void (*vp8_fast_quantize_b)(BLOCK *b, BLOCKD *d); extern void vp8_fast_quantize_b_c(BLOCK *b, BLOCKD *d); void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction); |