diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-08-03 10:18:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-03 10:18:25 -0700 |
| commit | 4aabfaa5d03501ff6887039425d578a08ab3a010 (patch) | |
| tree | 6c84215a59dbb992a9247ab1d0e85ac66ab54269 /vp8/encoder/bitstream.c | |
| parent | 2914ab2e8b9fca26a430aed1dea56070621eb71e (diff) | |
| parent | 0ebf548c752ef25ff8e9a65037fd9aee6420184e (diff) | |
| download | libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar.gz libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar.bz2 libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.zip | |
Merge "Merging and bug-fix in enhanced_interp experiment" into experimental
Diffstat (limited to 'vp8/encoder/bitstream.c')
| -rw-r--r-- | vp8/encoder/bitstream.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 97e791bc6..f42a2e6a0 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -2273,7 +2273,6 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) // Signal whether to allow high MV precision vp8_write_bit(bc, (xd->allow_high_precision_mv) ? 1 : 0); #endif -#if CONFIG_ENHANCED_INTERP #if CONFIG_SWITCHABLE_INTERP if (pc->mcomp_filter_type == SWITCHABLE) { /* Check to see if only one of the filters is actually used */ @@ -2301,7 +2300,6 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) if (pc->mcomp_filter_type != SWITCHABLE) #endif /* CONFIG_SWITCHABLE_INTERP */ vp8_write_literal(bc, (pc->mcomp_filter_type), 2); -#endif /* CONFIG_ENHANCED_INTERP */ } vp8_write_bit(bc, pc->refresh_entropy_probs); |