commit acc0fec3d1ee1b0270b8fc8bcd375872f882d518
author Jim Bankoski <jimbankoski@google.com> Mon Jun 30 08:08:41 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon Jun 30 08:08:41 2014 -0700
tree 612b05ce4a7b2082ae4209771511409e3a1d0786
parent 2af46568bdb47330b9b26bed9655ebdc7c6347bd
parent a13bf653159324edb6124bc4aebc92c3dc4c1dfa

Merge "remove unused parms from rd_pick_inter_mode_sb_seg_skip"

vp9/common/vp9_alloccommon.c

diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
index 2386b13..ccbf3f6 100644
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -127,12 +127,15 @@
 int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height) {
   const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
   const int aligned_height = ALIGN_POWER_OF_TWO(height, MI_SIZE_LOG2);
+#if CONFIG_INTERNAL_STATS || CONFIG_VP9_POSTPROC
   const int ss_x = cm->subsampling_x;
   const int ss_y = cm->subsampling_y;
 
+  // TODO(agrange): this should be conditionally allocated.
   if (vp9_realloc_frame_buffer(&cm->post_proc_buffer, width, height, ss_x, ss_y,
                                VP9_DEC_BORDER_IN_PIXELS, NULL, NULL, NULL) < 0)
     goto fail;
+#endif
 
   set_mb_mi(cm, aligned_width, aligned_height);
 
@@ -199,9 +202,11 @@
 
   init_frame_bufs(cm);
 
+#if CONFIG_INTERNAL_STATS || CONFIG_VP9_POSTPROC
   if (vp9_alloc_frame_buffer(&cm->post_proc_buffer, width, height, ss_x, ss_y,
                              VP9_ENC_BORDER_IN_PIXELS) < 0)
     goto fail;
+#endif
 
   return 0;