summaryrefslogtreecommitdiff
path: root/vp8/common/arm
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-08-20 16:06:56 -0400
committerJohn Koleszar <jkoleszar@google.com>2010-09-02 11:52:37 -0400
commit76640f85dac7145a7f275ca04708496fc136bbe5 (patch)
tree0d5fda16cc01f835f7ca4c2842f468588b277258 /vp8/common/arm
parent7a3e0a1d93648cf14fde9a83d5de22b8c3979b55 (diff)
downloadlibvpx-76640f85dac7145a7f275ca04708496fc136bbe5.tar
libvpx-76640f85dac7145a7f275ca04708496fc136bbe5.tar.gz
libvpx-76640f85dac7145a7f275ca04708496fc136bbe5.tar.bz2
libvpx-76640f85dac7145a7f275ca04708496fc136bbe5.zip
encoder: remove postproc dependency
Remove the dependency on postproc.c for the encoder in general, the only unchecked need for it is when CONFIG_PSNR is enabled. All other cases are already wrapped in CONFIG_POSTPROC. In the CONFIG_PSNR case the file will still be included. Additionally, when VP8_SET_POSTPROC is used with the encoder when post processing has been disabled an error will be returned. This addresses issue #153. Change-Id: Ia6dfe20167f7077734a6058cbd1d794550346089
Diffstat (limited to 'vp8/common/arm')
-rw-r--r--vp8/common/arm/systemdependent.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp8/common/arm/systemdependent.c b/vp8/common/arm/systemdependent.c
index b58cd789f..6e8651754 100644
--- a/vp8/common/arm/systemdependent.c
+++ b/vp8/common/arm/systemdependent.c
@@ -126,11 +126,13 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c;
#endif
+#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_PSNR)
rtcd->postproc.down = vp8_mbpost_proc_down_c;
rtcd->postproc.across = vp8_mbpost_proc_across_ip_c;
rtcd->postproc.downacross = vp8_post_proc_down_and_across_c;
rtcd->postproc.addnoise = vp8_plane_add_noise_c;
#endif
+#endif
#if HAVE_ARMV7
vp8_build_intra_predictors_mby_ptr = vp8_build_intra_predictors_mby_neon;