summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2013-07-22 13:42:11 -0700
committerJames Zern <jzern@google.com>2013-07-22 13:42:11 -0700
commit0a58f462b80847b0a2db7dbbfc39f551ce96fb49 (patch)
tree728fddfd65ca675289c4c1e98986fd4d8766ea0f
parentccf6710dc2edc32583d94e3afb1da7bb30092dc2 (diff)
downloadlibvpx-0a58f462b80847b0a2db7dbbfc39f551ce96fb49.tar
libvpx-0a58f462b80847b0a2db7dbbfc39f551ce96fb49.tar.gz
libvpx-0a58f462b80847b0a2db7dbbfc39f551ce96fb49.tar.bz2
libvpx-0a58f462b80847b0a2db7dbbfc39f551ce96fb49.zip
VP9_COMMON: remove unused temp_scale_frame
Change-Id: I696a0dca1d02d365e283029d1d077710bd5680e0
-rw-r--r--vp9/common/vp9_alloccommon.c5
-rw-r--r--vp9/common/vp9_onyxc_int.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
index 0a4f921c2..554a31730 100644
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -53,7 +53,6 @@ void vp9_free_frame_buffers(VP9_COMMON *oci) {
for (i = 0; i < NUM_YV12_BUFFERS; i++)
vp9_free_frame_buffer(&oci->yv12_fb[i]);
- vp9_free_frame_buffer(&oci->temp_scale_frame);
vp9_free_frame_buffer(&oci->post_proc_buffer);
vpx_free(oci->mip);
@@ -121,10 +120,6 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {
oci->fb_idx_ref_cnt[i] = 1;
}
- if (vp9_alloc_frame_buffer(&oci->temp_scale_frame, width, 16, ss_x, ss_y,
- VP9BORDERINPIXELS) < 0)
- goto fail;
-
if (vp9_alloc_frame_buffer(&oci->post_proc_buffer, width, height, ss_x, ss_y,
VP9BORDERINPIXELS) < 0)
goto fail;
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index 2efdf8fa3..8b76ac711 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -130,10 +130,7 @@ typedef struct VP9Common {
struct scale_factors active_ref_scale[ALLOWED_REFS_PER_FRAME];
int new_fb_idx;
-
YV12_BUFFER_CONFIG post_proc_buffer;
- YV12_BUFFER_CONFIG temp_scale_frame;
-
FRAME_TYPE last_frame_type; /* Save last frame's frame type for motion search. */
FRAME_TYPE frame_type;