diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-12-07 13:03:57 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-12-07 13:48:53 -0800 |
| commit | d37cd9768258aa976bfd0df69a5ae9dded04a30c (patch) | |
| tree | 3d035334d7372da6e0bb40904ea43c590c6dafa1 /vp8/common/findnearmv.h | |
| parent | 76feb965d3340cfe38a06ee017ff02e4a493cecf (diff) | |
| download | libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar.gz libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar.bz2 libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.zip | |
Removed #if CONFIG_I8X8
This commit removed the macro CONFIG_I8X8, which was used to indicate
the 8x8 intra prediction experiment, made the change fully merged in.
Change-Id: Iafa4443781ce6e83f5591c12ba615a0e92ce0ea0
Diffstat (limited to 'vp8/common/findnearmv.h')
| -rw-r--r-- | vp8/common/findnearmv.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h index b26f9873b..30570a10d 100644 --- a/vp8/common/findnearmv.h +++ b/vp8/common/findnearmv.h @@ -137,9 +137,7 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) return B_HE_PRED; case TM_PRED: return B_TM_PRED; -#if CONFIG_I8X8 case I8X8_PRED: -#endif case B_PRED: return (cur_mb->bmi + b + 3)->as_mode; default: @@ -167,9 +165,7 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO return B_HE_PRED; case TM_PRED: return B_TM_PRED; -#if CONFIG_I8X8 case I8X8_PRED: -#endif case B_PRED: return (cur_mb->bmi + b + 12)->as_mode; default: |