diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-21 15:35:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-21 15:35:24 -0700 |
| commit | 788d7f10d4e03b58b02c14b961200ccb3134c4f0 (patch) | |
| tree | c24362b1a4b5c38b9b9e6684c8a5db2ed6ccf8ed /vp8/common/blockd.h | |
| parent | 91dc8ce70d8071b114c907bf760d65bad83fe072 (diff) | |
| parent | 57679badf2970455117fb95e766d2ed202eb31bf (diff) | |
| download | libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar.gz libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar.bz2 libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.zip | |
Merge "Allow B_VL_PRED & B_LD_PRED modes with Superblocks" into experimental
Diffstat (limited to 'vp8/common/blockd.h')
| -rw-r--r-- | vp8/common/blockd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 511fe9e2a..3ab4cc3a9 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -400,7 +400,6 @@ typedef struct MacroBlockD { #define ACTIVE_HT16 300 #endif -#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM16X16 // convert MB_PREDICTION_MODE to B_PREDICTION_MODE static B_PREDICTION_MODE pred_mode_conv(MB_PREDICTION_MODE mode) { B_PREDICTION_MODE b_mode; @@ -442,7 +441,6 @@ static B_PREDICTION_MODE pred_mode_conv(MB_PREDICTION_MODE mode) { } return b_mode; } -#endif #if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM16X16 // transform mapping |