diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:52:54 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:53:02 -0400 |
| commit | ba83622a00b982297f71dccb25ecb9a8047afa4e (patch) | |
| tree | e21963481583fce9c1363ff8116f58ce7e2c90e5 /vp8/common/reconintra.h | |
| parent | 601781138241d506bed2c4cdb285a51714dce380 (diff) | |
| parent | 3788b3564c587983a10d7131b35c0d9c39540666 (diff) | |
| download | libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.gz libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.bz2 libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/encoder/onyx_if.c
Change-Id: Ieef9a58a2effdc68cf52bc5f14d90c31a1dbc13a
Diffstat (limited to 'vp8/common/reconintra.h')
| -rw-r--r-- | vp8/common/reconintra.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vp8/common/reconintra.h b/vp8/common/reconintra.h index 988b43a77..4025a5307 100644 --- a/vp8/common/reconintra.h +++ b/vp8/common/reconintra.h @@ -14,13 +14,6 @@ extern void init_intra_left_above_pixels(MACROBLOCKD *x); -extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x); -extern void (*vp8_build_intra_predictors_mby_s_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_s(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_s_neon(MACROBLOCKD *x); - extern void vp8_build_intra_predictors_mbuv(MACROBLOCKD *x); extern void vp8_build_intra_predictors_mbuv_s(MACROBLOCKD *x); |