ref: 5baa416b6c9da25c5299b1322d4d9a532768dc00
parent: 70fe2b3ec34da0d03acfb3748a3132a9c8b4b5a0
parent: dc1d2331f68e0b68add2ff1033cacfeacf3a0b5f
author: James Zern <[email protected]>
date: Tue Jul 16 09:00:14 EDT 2013
Merge "vp9: remove frames_{since,till}.. from MACROBLOCKD"
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -258,9 +258,6 @@
int mb_to_top_edge;
int mb_to_bottom_edge;
- unsigned int frames_since_golden;
- unsigned int frames_till_alt_ref_frame;
-
int lossless;
/* Inverse transform function pointers. */
void (*inv_txm4x4_1_add)(int16_t *input, uint8_t *dest, int stride);
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1705,9 +1705,6 @@
xd->mode_info_stride = cm->mode_info_stride;
xd->frame_type = cm->frame_type;
- xd->frames_since_golden = cm->frames_since_golden;
- xd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame;
-
// reset intra mode contexts
if (cm->frame_type == KEY_FRAME)
vp9_init_mbmode_probs(cm);