From 99f46d62d95ffbbdc2a5aebc699a316457725682 Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Wed, 11 Aug 2010 11:02:31 -0400 Subject: Moved gf_active code to encoder only The gf_active code is only used by the encoder, so it was moved from common and decoder. Change-Id: Iada15acd5b2b33ff70c34668ca87d4cfd0d05025 --- vp8/common/alloccommon.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'vp8/common/alloccommon.c') diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index d0a138d06..369d48101 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -54,11 +54,6 @@ void vp8_de_alloc_frame_buffers(VP8_COMMON *oci) oci->above_context[Y2CONTEXT] = 0; oci->mip = 0; - // Structure used to minitor GF useage - if (oci->gf_active_flags != 0) - vpx_free(oci->gf_active_flags); - - oci->gf_active_flags = 0; } int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) @@ -157,20 +152,6 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) vp8_update_mode_info_border(oci->mi, oci->mb_rows, oci->mb_cols); - // Structures used to minitor GF usage - if (oci->gf_active_flags != 0) - vpx_free(oci->gf_active_flags); - - oci->gf_active_flags = (unsigned char *)vpx_calloc(oci->mb_rows * oci->mb_cols, 1); - - if (!oci->gf_active_flags) - { - vp8_de_alloc_frame_buffers(oci); - return ALLOC_FAILURE; - } - - oci->gf_active_count = oci->mb_rows * oci->mb_cols; - return 0; } void vp8_setup_version(VP8_COMMON *cm) -- cgit v1.2.3