diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-11-06 16:28:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-11-06 16:28:54 -0800 |
| commit | 80fe4723d2c6676f7b3a8beeb90c3f53332920b7 (patch) | |
| tree | 39880598d7400621e54f25f46772d6dff3d5492a /vp8/encoder | |
| parent | ee28bb87b47094abb9cb7549d5a14f3cdf0955d3 (diff) | |
| parent | 78bf8284cfd81c04c979f3b37411fdd324b8eb06 (diff) | |
| download | libvpx-80fe4723d2c6676f7b3a8beeb90c3f53332920b7.tar libvpx-80fe4723d2c6676f7b3a8beeb90c3f53332920b7.tar.gz libvpx-80fe4723d2c6676f7b3a8beeb90c3f53332920b7.tar.bz2 libvpx-80fe4723d2c6676f7b3a8beeb90c3f53332920b7.zip | |
Merge "Removed mb_norm_activity_map"
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 7 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 4e2cd0ff7..c7d81b17f 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -355,8 +355,6 @@ static void dealloc_compressor_data(VP8_COMP *cpi) /* Activity mask based per mb zbin adjustments */ vpx_free(cpi->mb_activity_map); cpi->mb_activity_map = 0; - vpx_free(cpi->mb_norm_activity_map); - cpi->mb_norm_activity_map = 0; vpx_free(cpi->mb.pip); cpi->mb.pip = 0; @@ -1097,11 +1095,6 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi) vpx_calloc(sizeof(*cpi->mb_activity_map), cm->mb_rows * cm->mb_cols)); - vpx_free(cpi->mb_norm_activity_map); - CHECK_MEM_ERROR(cpi->mb_norm_activity_map, - vpx_calloc(sizeof(*cpi->mb_norm_activity_map), - cm->mb_rows * cm->mb_cols)); - /* allocate memory for storing last frame's MVs for MV prediction. */ vpx_free(cpi->lfmv); CHECK_MEM_ERROR(cpi->lfmv, vpx_calloc((cm->mb_rows+2) * (cm->mb_cols+2), diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 5cff899ac..ed9c7624f 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -649,7 +649,6 @@ typedef struct VP8_COMP /* Per MB activity measurement */ unsigned int activity_avg; unsigned int * mb_activity_map; - int * mb_norm_activity_map; /* Record of which MBs still refer to last golden frame either * directly or through 0,0 |