diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-02-02 13:34:13 -0500 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2012-02-02 13:34:13 -0500 |
| commit | 11c706488b8d457cb808a8a7ff1358ae55d36649 (patch) | |
| tree | 8ae8800530eb65193e6db9b04cefe1185bf7c8fd | |
| parent | e2000cc5ca4d0068e7ee1ad43a18cd67667950c0 (diff) | |
| download | libvpx-11c706488b8d457cb808a8a7ff1358ae55d36649.tar libvpx-11c706488b8d457cb808a8a7ff1358ae55d36649.tar.gz libvpx-11c706488b8d457cb808a8a7ff1358ae55d36649.tar.bz2 libvpx-11c706488b8d457cb808a8a7ff1358ae55d36649.zip | |
Removed frames_till_alt_ref_frame from MACROBLOCKD
Change-Id: Ieb05270ac332a4cc38ec4b7b995fc0150e0fffdf
| -rw-r--r-- | vp8/common/blockd.h | 1 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/encodeframe.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 2c8c8cd33..6a03f1e0c 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -261,7 +261,6 @@ typedef struct macroblockd int ref_frame_cost[MAX_REF_FRAMES]; - unsigned int frames_till_alt_ref_frame; vp8_subpix_fn_t subpixel_predict; vp8_subpix_fn_t subpixel_predict8x4; vp8_subpix_fn_t subpixel_predict8x8; diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index f65b7448e..16c5d394d 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -47,8 +47,6 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D mbd->mode_info_stride = pc->mode_info_stride; mbd->frame_type = pc->frame_type; - mbd->frames_till_alt_ref_frame = pc->frames_till_alt_ref_frame; - mbd->pre = pc->yv12_fb[pc->lst_fb_idx]; mbd->dst = pc->yv12_fb[pc->new_fb_idx]; diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 0af3e55d8..e762d2591 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -595,8 +595,6 @@ void init_encode_frame_mb_context(VP8_COMP *cpi) xd->frame_type = cm->frame_type; - xd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame; - // reset intra mode contexts if (cm->frame_type == KEY_FRAME) vp8_init_mbmode_probs(cm); diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index fdc4efa05..7740e5db7 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -437,8 +437,6 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi, mbd->frame_type = cm->frame_type; - mbd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame; - mb->src = * cpi->Source; mbd->pre = cm->yv12_fb[cm->lst_fb_idx]; mbd->dst = cm->yv12_fb[cm->new_fb_idx]; |