diff options
author | Yaowu Xu <yaowu@google.com> | 2011-12-07 13:55:58 -0800 |
---|---|---|
committer | Yaowu Xu <yaowu@google.com> | 2011-12-07 14:01:07 -0800 |
commit | b70f23caec2b06fc7e71b124e0fe8802d1c19ba7 (patch) | |
tree | 05ea64dab912fc48e5fe51d7ebc680f8f57066be /vp8/encoder/ratectrl.c | |
parent | d37cd9768258aa976bfd0df69a5ae9dded04a30c (diff) | |
download | libvpx-b70f23caec2b06fc7e71b124e0fe8802d1c19ba7.tar libvpx-b70f23caec2b06fc7e71b124e0fe8802d1c19ba7.tar.gz libvpx-b70f23caec2b06fc7e71b124e0fe8802d1c19ba7.tar.bz2 libvpx-b70f23caec2b06fc7e71b124e0fe8802d1c19ba7.zip |
Removed #if CONFIG_MULCONTEXT
This commit removed the macro CONFIG_MULCONTEXT, which was used to
indicate the experiment code for using separate context for altref
and normal frames. This commit made the change fully merged in.
Change-Id: I525f927f68e2365d37b340ef23b836a136a4f70b
Diffstat (limited to 'vp8/encoder/ratectrl.c')
-rw-r--r-- | vp8/encoder/ratectrl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index d4ca381ae..62735d5d3 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -262,16 +262,13 @@ void vp8_setup_key_frame(VP8_COMP *cpi) cpi->common.refresh_golden_frame = TRUE; cpi->common.refresh_alt_ref_frame = TRUE; -#if CONFIG_MULCONTEXT vpx_memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc)); vpx_memcpy(&cpi->common.lfc_a, &cpi->common.fc, sizeof(cpi->common.fc)); -#endif #if CONFIG_NEWNEAR vp8_init_mv_ref_counts(&cpi->common); #endif } -#if CONFIG_MULCONTEXT void vp8_setup_inter_frame(VP8_COMP *cpi) { if(cpi->common.refresh_alt_ref_frame) @@ -279,7 +276,6 @@ void vp8_setup_inter_frame(VP8_COMP *cpi) else vpx_memcpy(&cpi->common.fc, &cpi->common.lfc, sizeof(cpi->common.fc)); } -#endif static int estimate_bits_at_q(int frame_kind, int Q, int MBs, |